From 22858a2b4f72ee73b3421ff300f9bf83458288af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Wed, 25 Feb 2026 15:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9B=B4=E6=96=B0=E8=BF=87?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E7=94=A8=E6=88=B7=EF=BC=8C=E4=BB=8E?=
 =?UTF-8?q?his=E5=90=8C=E6=AD=A5=E5=B0=86=E4=B8=8D=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/His/UserController.php | 2 +-
 Laravel/app/Services/Admin/UserService.php              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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'])) {