diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index e66142c5..16a6e597 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -260,11 +260,15 @@ class UserController extends Controller ->select('id', 'name') ->where('name', 'LIKE', '%' . $request->name . '%'); - // اگر نقش کاربر Supervisor یا User باشه → فقط Userهای همون مرکز درمانی رو بگرد if ($User->hasRole('Supervisor') || $User->hasRole('User')) { - $query->where('medical_center_id', $User->medical_center_id); + $query->where(function ($q) use ($User) { + $q->where('medical_center_id', $User->medical_center_id) + ->orWhereHas('roles', function ($roleQuery) { + $roleQuery->where('name', 'Admin'); + }); + }); } - + $users = $query->get(); return MessageResponse::data($users);