|
@@ -175,19 +175,20 @@ public class AdminUserServiceImpl implements AdminUserService {
|
|
|
|
|
|
//获取原来的工作间删除负责人
|
|
//获取原来的工作间删除负责人
|
|
AdminUserDO user = getUser(updateObj.getId());
|
|
AdminUserDO user = getUser(updateObj.getId());
|
|
|
|
+ if (user!=null) {
|
|
|
|
+ DeptDO originDept = deptService.getDept(user.getDeptId());
|
|
|
|
|
|
- DeptDO originDept = deptService.getDept(user.getDeptId());
|
|
|
|
|
|
+ DeptSaveReqVO originNewDept = BeanUtils.toBean(originDept, DeptSaveReqVO.class);
|
|
|
|
|
|
- DeptSaveReqVO originNewDept = BeanUtils.toBean(originDept, DeptSaveReqVO.class);
|
|
|
|
-
|
|
|
|
- if (originDept!=null) {
|
|
|
|
- List<Long> originLeaderIdList = originNewDept.getLeaderUserId();
|
|
|
|
- if (originLeaderIdList == null) {
|
|
|
|
- originLeaderIdList = new ArrayList<>(); // 如果为空,则初始化为空列表
|
|
|
|
|
|
+ if (originDept != null) {
|
|
|
|
+ List<Long> originLeaderIdList = originNewDept.getLeaderUserId();
|
|
|
|
+ if (originLeaderIdList == null) {
|
|
|
|
+ originLeaderIdList = new ArrayList<>(); // 如果为空,则初始化为空列表
|
|
|
|
+ }
|
|
|
|
+ originLeaderIdList.removeIf(leaderId -> leaderId.equals(user.getId()));
|
|
|
|
+ originNewDept.setLeaderUserId(originLeaderIdList); // 设置更新后的负责人列表
|
|
|
|
+ deptService.updateDept(originNewDept);
|
|
}
|
|
}
|
|
- originLeaderIdList.removeIf(leaderId -> leaderId.equals(user.getId()));
|
|
|
|
- originNewDept.setLeaderUserId(originLeaderIdList); // 设置更新后的负责人列表
|
|
|
|
- deptService.updateDept(originNewDept);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
//添加部门负责人
|
|
//添加部门负责人
|