机构创建修改增加校验

src/main/java/com/newyetai/common/validation/constants/ValidProviderEnum.java

@@ -15,6 +15,7 @@ public enum ValidProviderEnum {
   USERNAME("username", (v) -> ValidateUtils.matchUsername((String) v)),
   PASSWORD("password", (v) -> ValidateUtils.matchPassword((String) v)),
   REAL_NAME("realName", (v) -> ValidateUtils.checkRealName((String) v)),
+  CREDIT_CODE("creditCode", (v) -> ValidateUtils.isCreditCode((String) v)),
   ;
   
   private static Map<String, ValidProviderEnum> validMap ;

src/main/java/com/newyetai/common/validation/util/ValidateUtils.java

@@ -246,4 +246,16 @@ public class ValidateUtils {
     return REAL_NAME_REG.matcher(realname).matches();
   }
 
+  /**
+   * 校验统一社会信用代码
+   *
+   * @param creditCode 统一社会信用代码
+   * @return boolean
+   */
+  public static boolean isCreditCode(String creditCode) {
+    if (StringUtils.isBlank(creditCode)) {
+      return false;
+    }
+    return cn.hutool.core.lang.Validator.isCreditCode(creditCode);
+  }
 }

src/main/java/com/newyetai/usercenter/org/dto/OrgCreateDTO.java

@@ -48,7 +48,7 @@ public class OrgCreateDTO extends BaseOperateDTO{
   private String realName;
 
   @ApiModelProperty("唯一社会信用代码")
-  @NotBlank(message = "唯一社会信用代码不能为空")
+  @Expression(type = ValidProviderEnum.CREDIT_CODE, message = "统一社会信用代码格式错误")
   private String creditCode;
   @ApiModelProperty("企业所在地")
 //  @NotBlank(message = "企业所在地不能为空")
@@ -70,6 +70,7 @@ public class OrgCreateDTO extends BaseOperateDTO{
   /**
    * 注册地址
    */
+  @NotBlank(message = "企业注册地址不能为空")
   private String registeredAddress;
 
   /**
@@ -90,7 +91,7 @@ public class OrgCreateDTO extends BaseOperateDTO{
   /**
    * 企业所在地 地点全称
    */
-  @NotBlank(message = "企业所在地不能为空")
+  @NotBlank(message = "企业经营地址不能为空")
   private String addressName;
 
   /**

src/main/java/com/newyetai/usercenter/org/dto/OrgModifyDTO.java

@@ -5,6 +5,8 @@ import com.newyetai.common.dto.BaseOperateDTO;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import com.newyetai.common.validation.annotation.Expression;
+import com.newyetai.common.validation.constants.ValidProviderEnum;
 import lombok.Data;
 
 /**
@@ -41,16 +43,19 @@ public class OrgModifyDTO extends BaseOperateDTO {
   /**
    * 唯一社会信用代码
    */
+  @Expression(type = ValidProviderEnum.CREDIT_CODE, message = "统一社会信用代码格式错误")
   private String creditCode;
 
   /**
    * 企业所在地 地点全称
    */
+  @NotBlank(message = "企业经营地址不能为空")
   private String addressName;
 
   /**
    * 注册地址
    */
+  @NotBlank(message = "企业注册地址不能为空")
   private String registeredAddress;