From dd32f4e3a3453c16e91eccbb6d235cd65e3557e4 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 21 Sep 2023 10:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E8=81=8C=E7=A7=BB=E9=99=A4=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bms/service/impl/BmsSupplierServiceImpl.java  | 2 ++
 .../modules/sys/service/impl/SysUserServiceImpl.java      | 5 +++++
 .../com/qs/serve/task/controller/TaskUserController.java  | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
index 8fee46f0..fc268a70 100644
--- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
@@ -280,10 +280,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         supplier.setRegion2Last(currentRegion.getId());
     }
 
+    @Override
     public void updateBmsSuppliersUserNullById(List<String> ids){
         this.baseMapper.updateBmsSuppliersUserNullById(ids);
     }
 
+    @Override
     public void updateBmsSuppliersOtherUserNullById(List<String> ids){
         this.baseMapper.updateBmsSuppliersOtherUserNullById(ids);
     }
diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
index 8f4a4a0f..f3a90d9f 100644
--- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
@@ -10,6 +10,7 @@ import com.qs.serve.common.framework.security.model.LoginUserType;
 import com.qs.serve.common.model.enums.HttpCode;
 import com.qs.serve.common.util.*;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.bo.SysUserLeaveBo;
 import com.qs.serve.modules.sys.entity.dto.SysUpdateSeeYonPassword;
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,6 +48,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysMenuMapper sysMenuMapper;
     private final SysPostMapper postMapper;
     private final SysPostUserMapper postUserMapper;
+    private final BmsSupplierMapper supplierMapper;
     private SeeYonProperties seeYonProperties;
 
     @Override
@@ -276,6 +279,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setLoginEnable(0);
         user.setServingLeaveDate(LocalDate.now());
         this.updateById(user);
+        supplierMapper.updateBmsSuppliersOtherUserNullById(Arrays.asList(userId));
+        supplierMapper.updateBmsSuppliersUserNullById(Arrays.asList(userId));
     }
 
     @Override
diff --git a/src/main/java/com/qs/serve/task/controller/TaskUserController.java b/src/main/java/com/qs/serve/task/controller/TaskUserController.java
index 1ad7a8b2..a1281ccf 100644
--- a/src/main/java/com/qs/serve/task/controller/TaskUserController.java
+++ b/src/main/java/com/qs/serve/task/controller/TaskUserController.java
@@ -3,6 +3,8 @@ package com.qs.serve.task.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.SysUserLeave;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,6 +42,8 @@ public class TaskUserController {
     SeeYonRequestBaseService seeYonRequestBaseService;
     SysUserService sysUserService;
     SysUserLeaveService sysUserLeaveService;
+    private final BmsSupplierMapper supplierMapper;
+    private final HisUserSupplierService hisUserSupplierService;
 
 
     public R<?> doLeave(){
@@ -62,6 +67,9 @@ public class TaskUserController {
         sysUser.setLoginEnable(0);
         sysUser.setServingLeaveDate(LocalDate.now());
         sysUserService.update(sysUser,updLqw);
+        supplierMapper.updateBmsSuppliersOtherUserNullById(userIds);
+        supplierMapper.updateBmsSuppliersUserNullById(userIds);
+        hisUserSupplierService.cleanTable();
         return R.ok();
     }