1.1.4 - updated user modals

app/api/admin/department-users-by-category/route.ts

@@ -11,7 +11,7 @@ export async function POST(request: NextRequest) {
 
     // Get admin's field and department
     const adminData = (await executeQuery(
-      "SELECT field, department FROM users WHERE national_id = ? AND role IS NOT NULL AND role != 'user'",
+      "SELECT role, field, department FROM users WHERE national_id = ? AND role IS NOT NULL AND role != 'user'",
       [adminId],
     )) as any[]
 
@@ -19,10 +19,10 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: "מנהל לא נמצא" }, { status: 404 })
     }
 
-    const { field: adminField, department: adminDepartment } = adminData[0]
+    const { role: adminRole, field: adminField, department: adminDepartment } = adminData[0]
 
-    if (!adminField || !adminDepartment) {
-      return NextResponse.json({ error: "למנהל לא הוגדרו תחום ומסגרת" }, { status: 400 })
+    if (adminRole !== "department_admin" && adminRole !== "global_admin" || !adminField || !adminDepartment) {
+      return NextResponse.json([])
     }
 
     let query = ""