hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserController.java

@@ -716,13 +716,13 @@ public class SysUserController {
 
         // 校验用户名
         String username = resource.getUsername().trim();
-        /*
         boolean availUsername = userService.count(Wrappers.<SysUser>lambdaQuery()
                 .eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL)
+                .eq(SysUser::getDeptId, deptId)
                 .eq(SysUser::getUsername, username)) == 0;
         if (!availUsername) {
             return R.failed("用户名已存在");
-        } */
+        }
 
 
         // 校验身份证上的年龄

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -657,12 +657,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
 
             // 校验部门下是否有启用的用户
-            // int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL).eq(SysUser::getUsername, username));
-            // .eq(dept != null, SysUser::getDeptId, dept.getDeptId()));
-            /* if (count != 0) {
+            int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL).eq(SysUser::getUsername, username)
+                .eq(dept != null, SysUser::getDeptId, userDTO.getDeptId()));
+            if (count != 0) {
                 log.info("手机号被占用");
                 errorMap(errorMap, "手机号被占用", commonUserDTO.getId());
-            } */
+            }
 
             userDTO.setPlatId(username);
             userDTO.setPhone(username);