From 1f9c0e8663d2b7b59d03caf9257afb7526a88ec3 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 09 十月 2021 18:41:39 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
index 9657bd8..1a58f36 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
@@ -20,6 +20,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -96,6 +98,13 @@
                     index++;
                     mistakes.add(setErrorObject(oneData,"名字不可为空,请填写姓名"));
                     continue;
+                }else{
+                    //判断导入的名字的长度是否超过10
+                    if(oneData.get(0).length() > 10){
+                        index++;
+                        mistakes.add(setErrorObject(oneData,"名字长度不可超过10,请重新填写姓名"));
+                        continue;
+                    }
                 }
                 vo.setName(oneData.get(0));
                 if (StringUtils.isEmpty(oneData.get(1))) {
@@ -114,6 +123,16 @@
                     index++;
                     mistakes.add(setErrorObject(oneData,"联系电话不可为空,请填写联系电话"));
                     continue;
+                }else{
+                    //验证手机号正则
+                    String regex = "^[1][3,4,5,6,7,8,9][0-9]{9}$";
+                    Pattern pattern = Pattern.compile(regex);
+                    Matcher m = pattern.matcher(oneData.get(3));
+                    if(!m.matches()){
+                        index++;
+                        mistakes.add(setErrorObject(oneData,"联系电话输入错误,请核对联系电话"));
+                        continue;
+                    }
                 }
                 vo.setPhone(oneData.get(3));
                 if (StringUtils.isEmpty(oneData.get(4))) {

--
Gitblit v1.7.1