11.13

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java

@@ -16,7 +16,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeptDO>()
-                .inIfPresent(DeptDO::getLeaderUserId, Collections.singletonList(reqVO.getLeaderUserId()))
+                .inIfPresent(DeptDO::getLeaderUserId, reqVO.getLeaderUserId())
                 .likeIfPresent(DeptDO::getPhone, reqVO.getPhone())//电话
                 .likeIfPresent(DeptDO::getEmail,reqVO.getEmail())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -135,7 +135,7 @@ public class AdminUserServiceImpl implements AdminUserService {
     @LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_UPDATE_SUB_TYPE, bizNo = "{{#updateReqVO.id}}",
             success = SYSTEM_USER_UPDATE_SUCCESS)
     public void updateUser(UserSaveReqVO updateReqVO) {
-        if (updateReqVO!=null) {
+        if (updateReqVO.getPassword()!=null) {
             updateReqVO.setPassword(encodePassword(updateReqVO.getPassword())); // 特殊：此处不更新密码
         }
         // 1. 校验正确性
@@ -150,15 +150,15 @@ public class AdminUserServiceImpl implements AdminUserService {
             AdminUserDO user = getUser(updateObj.getId());
             DeptDO originDept = deptService.getDept(user.getDeptId());
             DeptSaveReqVO originNewDept = BeanUtils.toBean(originDept, DeptSaveReqVO.class);
-
-            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);
-
 
             //添加部门负责人
             DeptDO dept = deptService.getDept(updateReqVO.getDeptId());