From ec6e33699e889b6123bb1012653dde1be0cb11c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Tue, 3 Mar 2026 11:35:08 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[payroll]=20=EA=B8=89=EC=97=AC=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EC=A4=80=EC=9D=84=20?= =?UTF-8?q?=EC=9E=85=EC=82=AC=EC=9D=BC=20=EC=98=A4=EB=A6=84=EC=B0=A8?= =?UTF-8?q?=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/HR/PayrollService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Services/HR/PayrollService.php b/app/Services/HR/PayrollService.php index 813179d0..c0e19b11 100644 --- a/app/Services/HR/PayrollService.php +++ b/app/Services/HR/PayrollService.php @@ -48,7 +48,13 @@ private function buildFilteredQuery(array $filters = []) $month = $filters['month'] ?? now()->month; $query->forPeriod((int) $year, (int) $month); - return $query->orderBy('created_at', 'desc'); + return $query + ->leftJoin('tenant_user_profiles as emp', function ($join) use ($tenantId) { + $join->on('payrolls.user_id', '=', 'emp.user_id') + ->where('emp.tenant_id', '=', $tenantId); + }) + ->select('payrolls.*') + ->orderByRaw("COALESCE(emp.json_extra->>'$.hire_date', '9999-12-31') ASC"); } /**