From 6d3482679dc6730ec4eb247130db0763e4704727 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 10:40:43 +0800
Subject: [PATCH] 修改用学员时处理部门管理员标识
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 49a14b9..3ce7a9e 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -21,10 +21,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
@@ -141,11 +138,17 @@
user.setModifyTime(new Date());
userService.updateByIdFilter(user);
}
+ Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
for (Integer s : model.getDeptIds()) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
userDepartmentMapper.insert(userDepartment);
}
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
--
Gitblit v1.8.0