浏览代码

fix: 依赖和引用

shc 11 月之前
父节点
当前提交
778ecbe9e5

+ 5 - 0
hnqz-upms/hnqz-upms-biz/pom.xml

@@ -167,6 +167,11 @@
 			<version>4.1.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.16.1</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
 		<dependency>

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

@@ -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());