|
@@ -256,7 +256,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
|
|
|
String errorInfo = null;
|
|
|
|
|
|
- if (StringUtils.isEmpty(roleName)) {
|
|
|
+ if (StringUtils.isEmpty(roleName) || dept == null) {
|
|
|
errorInfo = "角色名称为空";
|
|
|
} else {
|
|
|
|
|
@@ -528,11 +528,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
|
|
|
// 校验用户所属企业
|
|
|
- SysDept dept = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().like(SysDept::getName, StrUtil.cleanBlank(commonUserDTO.getRealName()))).get(0);
|
|
|
- if (dept == null) {
|
|
|
+ List<SysDept> list = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().like(SysDept::getName, StrUtil.cleanBlank(commonUserDTO.getEntName())));
|
|
|
+ SysDept dept = null;
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
|
log.error("所属企业不存在");
|
|
|
errorMap(errorMap, "所属企业不存在", commonUserDTO.getId());
|
|
|
} else {
|
|
|
+ dept = list.get(0);
|
|
|
userDTO.setDeptId(dept.getDeptId());
|
|
|
}
|
|
|
|
|
@@ -570,8 +572,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
|
|
|
// 校验部门下是否有启用的用户
|
|
|
- int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, username)
|
|
|
- .eq(dept != null, SysUser::getDeptId, dept.getDeptId()));
|
|
|
+ int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, username));
|
|
|
+ // .eq(dept != null, SysUser::getDeptId, dept.getDeptId()));
|
|
|
if (count != 0) {
|
|
|
log.info("手机号被占用");
|
|
|
errorMap(errorMap, "手机号被占用", commonUserDTO.getId());
|