From ecd813c0b779e5d7b566ea42e120deb116524884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Fri, 6 Mar 2026 14:31:48 +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?=ED=87=B4=EC=82=AC=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 - tenant_user_profiles.employee_status = 'resigned' 필터 추가 - search(), list() 두 엔드포인트 모두 적용 --- .../Controllers/Api/Admin/TenantUserApiController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Http/Controllers/Api/Admin/TenantUserApiController.php b/app/Http/Controllers/Api/Admin/TenantUserApiController.php index 69cb510e..b708046a 100644 --- a/app/Http/Controllers/Api/Admin/TenantUserApiController.php +++ b/app/Http/Controllers/Api/Admin/TenantUserApiController.php @@ -29,6 +29,10 @@ public function search(Request $request): JsonResponse }) ->leftJoin('departments', 'departments.id', '=', 'tp.department_id') ->whereNull('users.deleted_at') + ->where(function ($q) { + $q->whereNull('tp.employee_status') + ->orWhere('tp.employee_status', '!=', 'resigned'); + }) ->when($query, function ($q) use ($query) { $q->where(function ($sub) use ($query) { $sub->where('users.name', 'like', "%{$query}%") @@ -80,6 +84,10 @@ public function list(): JsonResponse ->whereRaw('pos_title.`key` COLLATE utf8mb4_unicode_ci = tp.job_title_key COLLATE utf8mb4_unicode_ci'); }) ->whereNull('users.deleted_at') + ->where(function ($q) { + $q->whereNull('tp.employee_status') + ->orWhere('tp.employee_status', '!=', 'resigned'); + }) ->orderBy('departments.name') ->orderByRaw('COALESCE(pos_rank.sort_order, pos_title.sort_order, 9999) ASC') ->orderBy('users.name')