diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index ea7c4e8f..bc3c6245 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -38,15 +38,22 @@ class UserController extends Controller
     {
         /** @var User $user */
         $user = User::query()->findOrFail($request->route('id'));
-        $user->fill($request->validated());
-        if ($password = $request->validated('password')) {
+        $validated = $request->validated();
+
+        if (empty($validated['password'])) {
+            unset($validated['password']);
+        } else {
             $user->forceFill([
-                'password' => Hash::make($password),
+                'password' => Hash::make($validated['password']),
                 'remember_token' => Str::random(60),
             ]);
 
             event(new PasswordReset($user));
         }
+
+        $user->fill($validated);
+        $user->group_id = $validated['group_id'];
+
         if (!$user->save()) {
             return $this->error('保存失败');
         }
diff --git a/app/Http/Requests/Admin/UserRequest.php b/app/Http/Requests/Admin/UserRequest.php
index ae4e73be..c04fce35 100644
--- a/app/Http/Requests/Admin/UserRequest.php
+++ b/app/Http/Requests/Admin/UserRequest.php
@@ -15,6 +15,7 @@ class UserRequest extends FormRequest
     public function rules()
     {
         return [
+            'group_id' => 'required',
             'name' => 'required|between:2,30',
             'capacity' => 'required|numeric',
             'password' => ['nullable', Rules\Password::defaults()],
@@ -25,7 +26,8 @@ class UserRequest extends FormRequest
     public function attributes()
     {
         return [
-            'name' => '组名称',
+            'group_id' => '角色组',
+            'name' => '昵称',
             'capacity' => '总容量',
             'password' => '密码',
             'status' => '状态',
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php
index ab9a1f31..3ef18078 100644
--- a/resources/views/admin/user/edit.blade.php
+++ b/resources/views/admin/user/edit.blade.php
@@ -8,6 +8,16 @@
                 <div class="overflow-hidden rounded-md">
                     <div class="px-4 py-5 bg-white sm:p-6">
                         <div class="grid grid-cols-6 gap-6">
+                            <div class="col-span-6">
+                                <label class="block">
+                                    <span class="text-gray-700">选择角色组</span>
+                                    <x-select name="group_id" class="block w-full mt-1 form-multiselect">
+                                        @foreach(\App\Models\Group::query()->get() as $group)
+                                            <option value="{{ $group->id }}" {{ $user->group_id == $group->id ? 'selected' : '' }}>{{ $group->name }}</option>
+                                        @endforeach
+                                    </x-select>
+                                </label>
+                            </div>
                             <div class="col-span-6">
                                 <label for="email" class="block text-sm font-medium text-gray-700">邮箱</label>
                                 <x-input type="email" id="email" value="{{ $user->email }}" disabled />