feat: 修复用户组编辑时日志关联移出的用户组

src/backend/bisheng/api/services/audit_log.py

@@ -274,16 +274,13 @@ def _system_log(cls, user: UserPayload, ip_address: str, group_ids: List[int], e
         AuditLogDao.insert_audit_logs([audit_log])
 
     @classmethod
-    def update_user(cls, user: UserPayload, ip_address: str, user_id: int, note: str):
+    def update_user(cls, user: UserPayload, ip_address: str, user_id: int, group_ids: List[int], note: str):
         """
         修改用户的用户组和角色
         """
         logger.info(f"act=update_system_user user={user.user_name} ip={ip_address} user_id={user_id} note={note}")
         user_info = UserDao.get_user(user_id)
-        # 获取用户所属的分组
-        user_group = UserGroupDao.get_user_group(user_id)
-        user_group = [one.group_id for one in user_group]
-        cls._system_log(user, ip_address, user_group, EventType.UPDATE_USER.value,
+        cls._system_log(user, ip_address, group_ids, EventType.UPDATE_USER.value,
                         ObjectType.USER_CONF.value, str(user_id), user_info.user_name, note)
 
     @classmethod

src/backend/bisheng/api/services/role_group_service.py

@@ -154,7 +154,7 @@ def replace_user_groups(self, request: Request, login_user: UserPayload, user_id
         for one in group_ids:
             note += group_dict.get(one, one) + "、"
         note = note.rstrip('、')
-        AuditLogService.update_user(login_user, get_request_ip(request), user_id, note)
+        AuditLogService.update_user(login_user, get_request_ip(request), user_id, group_dict.keys(), note)
         return None
 
     def get_user_groups_list(self, user_id: int) -> List[GroupRead]:

src/backend/bisheng/api/v1/user.py

@@ -548,6 +548,7 @@ def update_user_role_hook(request: Request, login_user: UserPayload, user_id: in
     logger.info(f'update_user_role_hook, user_id: {user_id}, old_roles: {old_roles}, new_roles: {new_roles}')
     # 写入审计日志
     role_info = RoleDao.get_role_by_ids(old_roles + new_roles)
+    group_ids = list(set([role.group_id for role in role_info]))
     role_dict = {one.id: one.role_name for one in role_info}
     note = "编辑前角色："
     for one in old_roles:
@@ -557,7 +558,7 @@ def update_user_role_hook(request: Request, login_user: UserPayload, user_id: in
     for one in new_roles:
         note += role_dict[one] + "、"
     note = note.rstrip("、")
-    AuditLogService.update_user(login_user, get_request_ip(request), user_id, note)
+    AuditLogService.update_user(login_user, get_request_ip(request), user_id, group_ids, note)
 
 
 @router.get('/user/role', status_code=200)