diff --git a/app/Http/Controllers/Api/Admin/TenantUserApiController.php b/app/Http/Controllers/Api/Admin/TenantUserApiController.php index b708046a..81322f8e 100644 --- a/app/Http/Controllers/Api/Admin/TenantUserApiController.php +++ b/app/Http/Controllers/Api/Admin/TenantUserApiController.php @@ -84,10 +84,14 @@ public function list(): JsonResponse ->whereRaw('pos_title.`key` COLLATE utf8mb4_unicode_ci = tp.job_title_key COLLATE utf8mb4_unicode_ci'); }) ->whereNull('users.deleted_at') + ->whereNotNull('tp.department_id') ->where(function ($q) { $q->whereNull('tp.employee_status') ->orWhere('tp.employee_status', '!=', 'resigned'); }) + ->when($tenantId == 1, function ($q) { + $q->where('departments.name', '!=', '영업팀'); + }) ->orderBy('departments.name') ->orderByRaw('COALESCE(pos_rank.sort_order, pos_title.sort_order, 9999) ASC') ->orderBy('users.name')