From e38ef0f1d55857040af74204bda39d4a0415afc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Sat, 7 Mar 2026 21:53:22 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[approval]=20=EA=B2=B0=EC=9E=AC=EC=84=A0?= =?UTF-8?q?=20=EC=9D=B8=EC=9B=90=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=AF=B8=EB=B0=B0=EC=A0=95/=ED=87=B4=EC=82=AC/=EC=99=B8?= =?UTF-8?q?=EC=A3=BC=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 부서 미배정(department_id NULL) 사용자 목록에서 제외 - 코드브릿지엑스(tenant_id=1) 테넌트에서 영업팀(외주) 제외 --- app/Http/Controllers/Api/Admin/TenantUserApiController.php | 4 ++++ 1 file changed, 4 insertions(+) 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')