Pārlūkot izejas kodu

fix:
字符串非空判断改为@NotBlank

18339543638 2 gadi atpakaļ
vecāks
revīzija
5a2668b419

+ 5 - 4
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/dict/dto/SysDictDTO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -26,20 +27,20 @@ public class SysDictDTO extends TreeNode<String> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @NotNull(message = "字典id不能为空",groups = {Update.class})
+    @NotBlank(message = "字典id不能为空",groups = {Update.class})
     private String id;
 
 
     @ApiModelProperty(value = "字典编码",required = true)
-    @NotNull(message = "字典编码不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "字典编码不能为空",groups = {Insert.class, Update.class})
     private String dictCode;
 
-    @NotNull(message = "字典名称不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "字典名称不能为空",groups = {Insert.class, Update.class})
     @ApiModelProperty(value = "字典名称",required = true)
     private String dictName;
 
     @ApiModelProperty(value = "字典类型  sys:系统字典 biz:业务字典",required = true)
-    @NotNull(message = "字典类型不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "字典类型不能为空",groups = {Insert.class, Update.class})
     private String dictType;
 
     @ApiModelProperty(value = "颜色")

+ 3 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysOrgDTO.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -24,11 +25,11 @@ public class SysOrgDTO extends TreeNode<String> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @NotNull(message = "主键不能为空",groups = {Update.class})
+    @NotBlank(message = "主键不能为空",groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "部门名称",required = true)
-    @NotNull(message = "部门名称不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "部门名称不能为空",groups = {Insert.class, Update.class})
     private String name;
 
     @ApiModelProperty(value = "部门电话")

+ 4 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysPortalDTO.java

@@ -7,6 +7,7 @@ import cn.tr.plugin.mybatis.pojo.BaseDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -19,16 +20,16 @@ import javax.validation.constraints.Pattern;
 @Data
 public class SysPortalDTO  extends BaseDTO {
     @ApiModelProperty("门户id")
-    @NotNull(message = "门户id不能为空",groups = {Update.class})
+    @NotBlank(message = "门户id不能为空",groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "门户编码",required = true)
-    @NotNull(message = "门户编码不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "门户编码不能为空",groups = {Insert.class,Update.class})
     @Pattern(regexp = "^[A-Za-z0-9]+$", message = "字典编码为数字以及字母",groups = {Insert.class,Update.class})
     private String code;
 
     @ApiModelProperty(value = "门户名称",required = true)
-    @NotNull(message = "门户名称不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "门户名称不能为空",groups = {Insert.class,Update.class})
     private String name;
 
     /**

+ 4 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysPositionDTO.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
@@ -22,17 +23,17 @@ public class SysPositionDTO extends BaseDTO {
     private static final long serialVersionUID = -7314723402227370899L;
     /** id */
     @ApiModelProperty(value = "id")
-    @NotNull(message = "岗位id不能为空",groups = {Update.class})
+    @NotBlank(message = "岗位id不能为空",groups = {Update.class})
     private String id;
 
     /** 名称 */
     @ApiModelProperty(value = "岗位名称",required = true)
-    @NotNull(message = "岗位名称不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "岗位名称不能为空",groups = {Insert.class,Update.class})
     private String posName;
 
     /** 编码 */
     @ApiModelProperty(value = "岗位编码",required = true)
-    @NotNull(message = "岗位编码不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "岗位编码不能为空",groups = {Insert.class,Update.class})
     @Pattern(regexp = "^[A-Za-z0-9]+$", message = "岗位编码为数字以及字母",groups = {Insert.class,Update.class})
     private String posCode;
 

+ 4 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysRoleDTO.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.*;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
@@ -22,16 +23,16 @@ import javax.validation.constraints.Pattern;
 public class SysRoleDTO extends BaseDTO {
     private static final long serialVersionUID = -522591939307162613L;
     @ApiModelProperty(value = "角色id",required = true)
-    @NotEmpty(message = "角色id不能为空",groups = { Update.class})
+    @NotBlank(message = "角色id不能为空",groups = { Update.class})
     private String id;
 
     @ApiModelProperty(value = "角色编码",required = true)
-    @NotEmpty(message = "角色编码不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "角色编码不能为空",groups = {Insert.class, Update.class})
     @Pattern(regexp = "^[A-Za-z0-9]+$", message = "角色编码为数字以及字母",groups = {Insert.class,Update.class})
     private String code;
 
     @ApiModelProperty(value = "角色名称",required = true)
-    @NotEmpty(message = "角色名称不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "角色名称不能为空",groups = {Insert.class, Update.class})
     private String name;
 
 //    @ApiModelProperty(value = "数据范围 1、全部数据权限;2、自定义数据权限;3、本部门数据权限;4、本部门及以下数据权限",required = true)

+ 4 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserDTO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -48,7 +49,7 @@ public class SysUserDTO extends BaseDTO {
      * 密码
      */
     @JsonIgnoreProperties(allowSetters = true)
-    @NotNull(message = "密码不能为空",groups = {Insert.class})
+    @NotBlank(message = "密码不能为空",groups = {Insert.class})
     @Length(min = 6,max = 16,message = "密码长度在6~16之间",groups = {Insert.class})
     private String password;
 
@@ -71,7 +72,7 @@ public class SysUserDTO extends BaseDTO {
      * 部门id
      */
     @ApiModelProperty(value = "组织id")
-    @NotEmpty(message = "组织不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "组织不能为空",groups = {Insert.class, Update.class})
     private String orgId;
 
     /**
@@ -103,7 +104,7 @@ public class SysUserDTO extends BaseDTO {
      * {@link UserStatusEnum#getValue()}
      */
     @ApiModelProperty(value = "用户状态",required = true)
-    @NotEmpty(message = "用户状态",groups = {Insert.class, Update.class})
+    @NotBlank(message = "用户状态",groups = {Insert.class, Update.class})
     private String status;
 
     /**

+ 7 - 6
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysUserEditDTO.java

@@ -6,6 +6,7 @@ import cn.tr.module.sys.user.enums.UserStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -22,15 +23,15 @@ import java.util.Set;
 public class SysUserEditDTO implements Serializable {
 
     @ApiModelProperty(value = "用户id")
-    @NotNull(message = "用户id不能为空",groups = {Update.class})
+    @NotBlank(message = "用户id不能为空",groups = {Update.class})
     private String id;
 
     @ApiModelProperty(value = "用户名",required = true)
-    @NotNull(message = "用户名不能为空",groups = {Update.class,Insert.class})
+    @NotBlank(message = "用户名不能为空",groups = {Update.class,Insert.class})
     private String username;
 
     @ApiModelProperty(value = "昵称")
-    @NotNull(message = "昵称不能为空",groups = {Update.class,Insert.class})
+    @NotBlank(message = "昵称不能为空",groups = {Update.class,Insert.class})
     private String nickname;
 
     @ApiModelProperty("角色id")
@@ -43,11 +44,11 @@ public class SysUserEditDTO implements Serializable {
 
 
     @ApiModelProperty(value = "性别")
-    @NotNull(message = "性别不能为空",groups = {Insert.class,Update.class})
+    @NotBlank(message = "性别不能为空",groups = {Insert.class,Update.class})
     private String gender;
 
     @ApiModelProperty(value = "组织部门id")
-    @NotEmpty(message = "组织部门不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "组织部门不能为空",groups = {Insert.class, Update.class})
     private String orgId;
 
     @ApiModelProperty(value = "手机号")
@@ -69,7 +70,7 @@ public class SysUserEditDTO implements Serializable {
      * {@link UserStatusEnum#getValue()}
      */
     @ApiModelProperty(value = "用户状态",required = true)
-    @NotEmpty(message = "用户状态不能为空",groups = {Insert.class, Update.class})
+    @NotBlank(message = "用户状态不能为空",groups = {Insert.class, Update.class})
     private String status;
 
     @ApiModelProperty(value = "备注")

+ 2 - 1
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/dto/SysValidateUsernameDTO.java

@@ -3,6 +3,7 @@ package cn.tr.module.sys.user.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -16,6 +17,6 @@ public class SysValidateUsernameDTO {
     @ApiModelProperty("用户id")
     private String userId;
     @ApiModelProperty(value = "用户名",required = true)
-    @NotNull(message = "用户名不能为空")
+    @NotBlank(message = "用户名不能为空")
     private String username;
 }