From f1fd28a2307e3de89d945a01e8708157cad9c528 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Mar 2021 10:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BB=BA=E8=AE=AE=20?=
 =?UTF-8?q?=E8=AF=B7=E8=BE=93=E5=85=A5=E6=AD=A3=E7=A1=AE=E7=9A=84=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/SubmitAdviceFormDTO.java     | 2 ++
 .../java/com/epmet/controller/UserAdviceController.java  | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SubmitAdviceFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SubmitAdviceFormDTO.java
index b4dae41cbd..ef4b246fc4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SubmitAdviceFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SubmitAdviceFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.List;
 
@@ -36,6 +37,7 @@ public class SubmitAdviceFormDTO implements Serializable {
     /**
      * 电话号码可为空 存*，不为空需校验
      */
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "请输入正确的手机号")
     private String phone;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
index e33e672739..8ad9e5da00 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
@@ -25,8 +25,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.AdviceListFormDTO;
 import com.epmet.dto.form.MyAdviceListFormDTO;
@@ -47,7 +47,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 
 /**
@@ -181,11 +180,7 @@ public class UserAdviceController {
     @PostMapping("submitadvice")
     public Result submitAdvice(@RequestBody SubmitAdviceFormDTO dto){
         ValidatorUtils.validateEntity(dto);
-        if (StringUtils.isNotBlank(dto.getPhone())){
-            if (!Pattern.matches("^1[3456789]\\d{9}$",dto.getPhone())){
-                throw new RenException("手机号格式错误");
-            }
-        }else {
+        if (StringUtils.isBlank(dto.getPhone())) {
             dto.setPhone("*");
         }
         userAdviceService.submitAdvice(dto,loginUserUtil.getLoginUserId());