From b2d639265cf3c620c786e7fa63b859baafbe8fde 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, 28 Feb 2026 12:14:14 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20[users]=20=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=ED=99=94=EB=A9=B4=EC=97=90=20=EC=86=8C?=
 =?UTF-8?q?=EC=86=8D=20=EB=B6=80=EC=84=9C=20=EC=84=A0=ED=83=9D=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- UserController: profile 쿼리에 department_id 추가
- edit.blade.php: 소속 부서 select 드롭다운 UI 추가
- UpdateUserRequest: department_id 유효성 검증 규칙 추가
- UserService: tenant_user_profiles에 department_id 저장 로직 추가
---
 app/Http/Controllers/UserController.php |  2 +-
 app/Http/Requests/UpdateUserRequest.php |  1 +
 app/Services/UserService.php            |  5 ++++-
 resources/views/users/edit.blade.php    | 17 +++++++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

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
                 </div>
             </div>
 
+            <!-- 소속 -->
+            <div class="mb-8">
+                <h2 class="text-lg font-semibold text-gray-800 mb-4 pb-2 border-b">소속</h2>
+                <div style="max-width: 400px;">
+                    <select name="department_id"
+                            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                        <option value="">선택하세요</option>
+                        @foreach($departments as $dept)
+                            <option value="{{ $dept->id }}" {{ ($profile?->department_id ?? '') == $dept->id ? 'selected' : '' }}>
+                                {{ $dept->name }}
+                            </option>
+                        @endforeach
+                    </select>
+                    <p class="text-xs text-gray-500 mt-1">결재선, 인사 관리 등에서 사용되는 소속 부서입니다.</p>
+                </div>
+            </div>
+
             <!-- 직급/직책 -->
             <div class="mb-8">
                 <h2 class="text-lg font-semibold text-gray-800 mb-4 pb-2 border-b">직급/직책</h2>