diff --git a/Laravel/app/Http/Controllers/API/His/UserController.php b/Laravel/app/Http/Controllers/API/His/UserController.php index e2f669e..d7bf368 100644 --- a/Laravel/app/Http/Controllers/API/His/UserController.php +++ b/Laravel/app/Http/Controllers/API/His/UserController.php @@ -47,7 +47,7 @@ class UserController extends Controller $u= DB::table('users')->where('id', $user->id)->update([ 'cn_name' => $data_v['emplName'], 'department_id' => isset($dept->id)?$dept->id:null, - 'group' => $group, + 'group' => $user->group_locked==1?$user->group:$group,//如果分组被手动调整过,那就维持手动的分组不变 ]); } if($u){ diff --git a/Laravel/app/Services/Admin/UserService.php b/Laravel/app/Services/Admin/UserService.php index 8b3f4ea..8a2bd88 100644 --- a/Laravel/app/Services/Admin/UserService.php +++ b/Laravel/app/Services/Admin/UserService.php @@ -38,6 +38,7 @@ class UserService 'cn_name' => $arr['info']['cname'], 'username' => $arr['info']['uname'], 'status' => $arr['info']['status'], + 'group_locked' => 1, ]; if (isset($arr['info']['department_id'])) {