Browse Source

用户\项目模块修改

anderx 2 years ago
parent
commit
d0dfd53bbe

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

@@ -132,7 +132,7 @@ public class SysUserController extends BaseController
         }
         else if ( userService.checkJobNumber(user))
         {
-            return error("新增用户'" + user.getJobNumber() + "'失败,工号已存在");
+            return error("新增用户,工号'" + user.getJobNumber() + "'失败,工号已存在");
         }
 //        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
 //        {
@@ -172,7 +172,7 @@ public class SysUserController extends BaseController
         }
         else if (userService.checkJobNumber(user))
         {
-            return error("修改用户'" + user.getUserName() + "'失败,工号已存在");
+            return error("修改用户,工号'" + user.getJobNumber() + "'失败,工号已存在");
         }
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUser(user));

+ 7 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -224,6 +224,7 @@ public class SysUser extends BaseEntity
         this.openId = openId;
     }
 
+    @NotNull(message="员工上级必须存在")
     public Long getSuperiorId() {
         return superiorId;
     }
@@ -249,6 +250,7 @@ public class SysUser extends BaseEntity
         this.jobNumber = jobNumber;
     }
 
+    @NotNull(message="员工是否全职必须存在")
     public Integer getFullJob() {
         return fullJob;
     }
@@ -282,6 +284,7 @@ public class SysUser extends BaseEntity
         return userId != null && 1L == userId;
     }
 
+    @NotNull(message="员工部门必须存在")
     public Long getDeptId()
     {
         return deptId;
@@ -410,6 +413,7 @@ public class SysUser extends BaseEntity
         this.loginDate = loginDate;
     }
 
+
     public SysDept getDept()
     {
         return dept;
@@ -430,6 +434,8 @@ public class SysUser extends BaseEntity
         this.roles = roles;
     }
 
+
+    @Size(min = 1,message = "角色必须存在")
     public Long[] getRoleIds()
     {
         return roleIds;
@@ -440,6 +446,7 @@ public class SysUser extends BaseEntity
         this.roleIds = roleIds;
     }
 
+    @Size(min = 1,message = "角色必须存在")
     public Long[] getPostIds()
     {
         return postIds;

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -235,7 +235,7 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
                 return true;
             }
         }else {
-            if (projectTask1!=null&&projectTask.getId().equals(projectTask1.getId())){
+            if (projectTask1!=null&&!projectTask.getId().equals(projectTask1.getId())){
                 return true;
             }
         }