fix: [approval] 연차사용촉진 통지서 Employee 모델 속성 수정
- 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:
@@ -787,7 +787,7 @@ public function getActiveEmployees(): \Illuminate\Database\Eloquent\Collection
|
|||||||
$tenantId = session('selected_tenant_id');
|
$tenantId = session('selected_tenant_id');
|
||||||
|
|
||||||
return \App\Models\HR\Employee::query()
|
return \App\Models\HR\Employee::query()
|
||||||
->with('user:id,name')
|
->with(['user:id,name', 'department:id,name'])
|
||||||
->forTenant($tenantId)
|
->forTenant($tenantId)
|
||||||
->activeEmployees()
|
->activeEmployees()
|
||||||
->where(function ($q) {
|
->where(function ($q) {
|
||||||
|
|||||||
@@ -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">
|
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>
|
<option value="">-- 직원 선택 --</option>
|
||||||
@foreach($employees as $emp)
|
@foreach($employees as $emp)
|
||||||
<option value="{{ $emp->id }}"
|
<option value="{{ $emp->user_id }}"
|
||||||
data-department="{{ $emp->departments->first()?->name ?? '' }}"
|
data-department="{{ $emp->department?->name ?? '' }}"
|
||||||
data-position="{{ $emp->position ?? '' }}">
|
data-position="{{ $emp->position_key ?? '' }}">
|
||||||
{{ $emp->name }} {{ $emp->departments->first()?->name ? '('.$emp->departments->first()->name.')' : '' }}
|
{{ $emp->display_name }} {{ $emp->department?->name ? '('.$emp->department->name.')' : '' }}
|
||||||
</option>
|
</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -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">
|
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>
|
<option value="">-- 직원 선택 --</option>
|
||||||
@foreach($employees as $emp)
|
@foreach($employees as $emp)
|
||||||
<option value="{{ $emp->id }}"
|
<option value="{{ $emp->user_id }}"
|
||||||
data-department="{{ $emp->departments->first()?->name ?? '' }}"
|
data-department="{{ $emp->department?->name ?? '' }}"
|
||||||
data-position="{{ $emp->position ?? '' }}">
|
data-position="{{ $emp->position_key ?? '' }}">
|
||||||
{{ $emp->name }} {{ $emp->departments->first()?->name ? '('.$emp->departments->first()->name.')' : '' }}
|
{{ $emp->display_name }} {{ $emp->department?->name ? '('.$emp->department->name.')' : '' }}
|
||||||
</option>
|
</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user