diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0589929e..d03d10d2 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -91,7 +91,7 @@ public function edit(int $id): View ? DB::table('tenant_user_profiles') ->where('tenant_id', $tenantId) ->where('user_id', $user->id) - ->first(['position_key', 'job_title_key', 'employee_status']) + ->first(['position_key', 'job_title_key', 'employee_status', 'department_id']) : null; return view('users.edit', compact('user', 'roles', 'departments', 'userRoleIds', 'userDepartmentIds', diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php index 0b1ad3a7..481c17a1 100644 --- a/app/Http/Requests/UpdateUserRequest.php +++ b/app/Http/Requests/UpdateUserRequest.php @@ -71,6 +71,7 @@ public function rules(): array 'position_key' => 'nullable|string|max:64', 'job_title_key' => 'nullable|string|max:64', 'employee_status' => 'nullable|in:active,leave,resigned', + 'department_id' => 'nullable|integer|exists:departments,id', ]; } diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 1132e5f0..db786fc0 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -280,6 +280,9 @@ public function updateUser(int $id, array $data): bool if (array_key_exists('employee_status', $data)) { $profileFields['employee_status'] = $data['employee_status'] ?: 'active'; } + if (array_key_exists('department_id', $data)) { + $profileFields['department_id'] = $data['department_id'] ?: null; + } if (! empty($profileFields)) { DB::table('tenant_user_profiles')->updateOrInsert( ['tenant_id' => $tenantId, 'user_id' => $id], @@ -289,7 +292,7 @@ public function updateUser(int $id, array $data): bool } // role_ids, department_ids, position/job_title은 User 모델의 fillable이 아니므로 제거 - unset($data['role_ids'], $data['department_ids'], $data['position_key'], $data['job_title_key'], $data['employee_status']); + unset($data['role_ids'], $data['department_ids'], $data['position_key'], $data['job_title_key'], $data['employee_status'], $data['department_id']); return $user->update($data); } diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index cde91d30..785c0712 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -70,6 +70,23 @@ class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:outline-none foc + +
+

소속

+
+ +

결재선, 인사 관리 등에서 사용되는 소속 부서입니다.

+
+
+

직급/직책