From 90fd403d9a926f02dfe7ffbf50007e7610b1f850 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Sat, 23 Nov 2024 10:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=94=A8=E6=88=B7=E5=90=8E?=
 =?UTF-8?q?=E5=B0=86=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E7=A7=BB=E5=87=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=89=80=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/service/user/AdminUserServiceImpl.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index 4a95314d..13bca1e4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -26,9 +26,11 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.factoryUser.Facto
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*;
+import cn.iocoder.yudao.module.system.dal.dataobject.attendance.groupuser.AttendanceGroupUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.dal.mysql.attendance.groupuser.AttendanceGroupUserMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
@@ -88,6 +90,8 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Resource
     private UserPostMapper userPostMapper;
+    @Resource
+    private AttendanceGroupUserMapper attendanceGroupUserMapper;
 
     @Resource
     private FileApi fileApi;
@@ -264,6 +268,9 @@ public class AdminUserServiceImpl implements AdminUserService {
             case 1:
                 // 关闭状态 设置用户编制为离职
                 updateObj.setUserStaffing(8);
+                // -- 将当前用户移除所在考情组
+                attendanceGroupUserMapper.delete(new LambdaQueryWrapper<AttendanceGroupUserDO>()
+                        .eq(AttendanceGroupUserDO::getUserId, id));
                 break;
         }
         userMapper.updateById(updateObj);
@@ -745,7 +752,7 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     @Override
     public List<AdminUserDO> getAllList(Integer status, Integer type, List<Long> userIds) {
-        if (CollUtil.isEmpty(userIds)){
+        if (CollUtil.isEmpty(userIds)) {
             return Collections.emptyList();
         }
         return userMapper.selectList(new LambdaQueryWrapper<AdminUserDO>()