SamProject/sam-manage
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: [approval] 연차사용촉진 통지서 Employee 모델 속성 수정

Browse Source 
- departments->first() → department? (BelongsTo 단수 관계)
- $emp->name → $emp->display_name
- $emp->position → $emp->position_key
- $emp->id → $emp->user_id
- LeaveService에 department eager load 추가
This commit is contained in:
김보곤
2026-03-07 00:33:36 +09:00
parent 2a1e72a15e
commit 617c89a33f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/HR/LeaveService.php
View File

@@ -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) {

8
resources/views/approvals/partials/_leave-promotion-1st-form.blade.php
View File

@@ -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>

8
resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php
View File

@@ -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>