From 617c89a33fce270d2fb2083f226df298689a6d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?=
 <lightone2017@codebridge-x.com>
Date: Sat, 7 Mar 2026 00:33:36 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20[approval]=20=EC=97=B0=EC=B0=A8=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=B4=89=EC=A7=84=20=ED=86=B5=EC=A7=80=EC=84=9C=20Emp?=
 =?UTF-8?q?loyee=20=EB=AA=A8=EB=8D=B8=20=EC=86=8D=EC=84=B1=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- departments->first() → department? (BelongsTo 단수 관계)
- $emp->name → $emp->display_name
- $emp->position → $emp->position_key
- $emp->id → $emp->user_id
- LeaveService에 department eager load 추가
---
 app/Services/HR/LeaveService.php                          | 2 +-
 .../partials/_leave-promotion-1st-form.blade.php          | 8 ++++----
 .../partials/_leave-promotion-2nd-form.blade.php          | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Services/HR/LeaveService.php b/app/Services/HR/LeaveService.php
index ab4f1181..7605c9c0 100644
--- a/app/Services/HR/LeaveService.php
+++ b/app/Services/HR/LeaveService.php
@@ -787,7 +787,7 @@ public function getActiveEmployees(): \Illuminate\Database\Eloquent\Collection
         $tenantId = session('selected_tenant_id');
 
         return \App\Models\HR\Employee::query()
-            ->with('user:id,name')
+            ->with(['user:id,name', 'department:id,name'])
             ->forTenant($tenantId)
             ->activeEmployees()
             ->where(function ($q) {
diff --git a/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php b/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php
index 3923ee31..e9b93af1 100644
--- a/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php
+++ b/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php
@@ -27,10 +27,10 @@
                                 class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500">
                             <option value="">-- 직원 선택 --</option>
                             @foreach($employees as $emp)
-                                <option value="{{ $emp->id }}"
-                                        data-department="{{ $emp->departments->first()?->name ?? '' }}"
-                                        data-position="{{ $emp->position ?? '' }}">
-                                    {{ $emp->name }} {{ $emp->departments->first()?->name ? '('.$emp->departments->first()->name.')' : '' }}
+                                <option value="{{ $emp->user_id }}"
+                                        data-department="{{ $emp->department?->name ?? '' }}"
+                                        data-position="{{ $emp->position_key ?? '' }}">
+                                    {{ $emp->display_name }} {{ $emp->department?->name ? '('.$emp->department->name.')' : '' }}
                                 </option>
                             @endforeach
                         </select>
diff --git a/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php b/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php
index a3b1c19d..ad5ccf3c 100644
--- a/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php
+++ b/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php
@@ -32,10 +32,10 @@
                                 class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500">
                             <option value="">-- 직원 선택 --</option>
                             @foreach($employees as $emp)
-                                <option value="{{ $emp->id }}"
-                                        data-department="{{ $emp->departments->first()?->name ?? '' }}"
-                                        data-position="{{ $emp->position ?? '' }}">
-                                    {{ $emp->name }} {{ $emp->departments->first()?->name ? '('.$emp->departments->first()->name.')' : '' }}
+                                <option value="{{ $emp->user_id }}"
+                                        data-department="{{ $emp->department?->name ?? '' }}"
+                                        data-position="{{ $emp->position_key ?? '' }}">
+                                    {{ $emp->display_name }} {{ $emp->department?->name ? '('.$emp->department->name.')' : '' }}
                                 </option>
                             @endforeach
                         </select>