Просмотр исходного кода

新增用户工号判定修改为部门

anderx лет назад: 2
Родитель
Сommit
8ebd4030fa

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -129,7 +129,7 @@ public class SysUserController extends BaseController
         {
             return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
         }
-        else if ( userService.checkJobNumber(user))
+         if ( userService.checkJobNumber(user))
         {
             return error("新增用户,工号'" + user.getJobNumber() + "'失败,工号已存在");
         }
@@ -172,7 +172,7 @@ public class SysUserController extends BaseController
         {
             return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
         }
-        else if (userService.checkJobNumber(user))
+        if (userService.checkJobNumber(user))
         {
             return error("修改用户,工号'" + user.getJobNumber() + "'失败,工号已存在");
         }

+ 3 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -605,6 +605,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkJobNumber(SysUser user) {
         Long companyId = getCompany(user.getDeptId());
+        log.debug("company="+companyId);
         SysUser sysUser = userMapper.checkJobNumber(user.getJobNumber(),companyId);
         if (StringUtils.isNotNull(user.getUserId())&&user.getUserId().equals(sysUser.getUserId())){
             return false;
@@ -615,8 +616,10 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     private Long getCompany(Long deptId) {
+        log.debug("depID="+deptId);
         SysDept sysDept = deptService.selectDeptById(deptId);
         String ancestors = sysDept.getAncestors();
+        log.debug("anc="+ancestors);
         String[] split = ancestors.split(",");
         if (split.length>2)return Long.valueOf(split[2]);
         else return deptId;