From e4948ad4c81b9568e03527fac064d4205930226a Mon Sep 17 00:00:00 2001
From: admin <peancharoen.pslcp3@gmail.com>
Date: Tue, 2 Jun 2026 15:03:27 +0700
Subject: [PATCH] 690602:1503 ADR-033-233 #05

---
 .../app/(admin)/admin/access-control/organizations/page.tsx    | 3 ++-
 frontend/app/(admin)/admin/doc-control/projects/page.tsx       | 3 ++-
 .../(admin)/admin/monitoring/system-logs/numbering/page.tsx    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/app/(admin)/admin/access-control/organizations/page.tsx b/frontend/app/(admin)/admin/access-control/organizations/page.tsx
index a6dd2fec..1d67f5fd 100644
--- a/frontend/app/(admin)/admin/access-control/organizations/page.tsx
+++ b/frontend/app/(admin)/admin/access-control/organizations/page.tsx
@@ -42,6 +42,7 @@ export default function OrganizationsPage() {
   const { data: organizations, isLoading } = useOrganizations({
     search: search || undefined,
   });
+  const organizationList: Organization[] = Array.isArray(organizations) ? (organizations as Organization[]) : [];
 
   const deleteOrg = useDeleteOrganization();
 
@@ -171,7 +172,7 @@ export default function OrganizationsPage() {
           ))}
         </div>
       ) : (
-        <DataTable columns={columns} data={organizations || []} />
+        <DataTable columns={columns} data={organizationList} />
       )}
 
       <OrganizationDialog open={dialogOpen} onOpenChange={setDialogOpen} organization={selectedOrganization} />
diff --git a/frontend/app/(admin)/admin/doc-control/projects/page.tsx b/frontend/app/(admin)/admin/doc-control/projects/page.tsx
index 077b1dac..e4e49be5 100644
--- a/frontend/app/(admin)/admin/doc-control/projects/page.tsx
+++ b/frontend/app/(admin)/admin/doc-control/projects/page.tsx
@@ -52,6 +52,7 @@ type ProjectFormData = z.infer<typeof projectSchema>;
 export default function ProjectsPage() {
   const [search, setSearch] = useState('');
   const { data: projects, isLoading } = useProjects({ search: search || undefined });
+  const projectList: Project[] = Array.isArray(projects) ? (projects as Project[]) : [];
 
   const createProject = useCreateProject();
   const updateProject = useUpdateProject();
@@ -212,7 +213,7 @@ export default function ProjectsPage() {
           ))}
         </div>
       ) : (
-        <DataTable columns={columns} data={projects || []} />
+        <DataTable columns={columns} data={projectList} />
       )}
 
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
diff --git a/frontend/app/(admin)/admin/monitoring/system-logs/numbering/page.tsx b/frontend/app/(admin)/admin/monitoring/system-logs/numbering/page.tsx
index b5face50..2a9aabfc 100644
--- a/frontend/app/(admin)/admin/monitoring/system-logs/numbering/page.tsx
+++ b/frontend/app/(admin)/admin/monitoring/system-logs/numbering/page.tsx
@@ -37,6 +37,7 @@ export default function NumberingLogsPage() {
     queryKey: ['numbering-errors'],
     queryFn: logService.getNumberingErrors,
   });
+  const errorList: NumberingError[] = Array.isArray(errors) ? (errors as NumberingError[]) : [];
 
   const columns: ColumnDef<NumberingError>[] = [
     {
@@ -82,7 +83,7 @@ export default function NumberingLogsPage() {
           <RefreshCw className="h-8 w-8 animate-spin text-muted-foreground" />
         </div>
       ) : (
-        <DataTable columns={columns} data={errors} />
+        <DataTable columns={columns} data={errorList} />
       )}
     </div>
   );