tuomin

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -636,12 +636,18 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String[] split = newPhone.split(",");
         Set<String>set =new HashSet();
         for (String s : split) {
+            if (StringUtils.isEmpty(s)){
+                return Result.error("有未输入新办手机号");
+            }
             set.add(s);
         }
         if (set.size()!=split.length){
             return Result.error("新办号码 不可重复!");
         }
-
+        String s = phoneCheck(businessReminderCard.getNewPhone());
+        if (!s.isEmpty()){
+            return Result.error(s);
+        }
         boolean save = businessReminderCardService.save(businessReminderCard);
         if (save) {
             return Result.OK();
@@ -675,6 +681,21 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         return Result.error("查询创建人有错");
     }
 
+
+    public String phoneCheck(String newPhone) {
+        String mes="";
+        String[] split = newPhone.split(",");
+        for (String s : split) {
+            String regex = "^((13[0-9])|(14[05679])|(15([0-3,5-9]))|(16[2567])|(17[01235678])|(18[0-9]|19[135689]))\\d{8}$";
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(s);
+            boolean isMatch = m.matches();
+            if (!isMatch){
+                mes+= "<新办手机号:"+s +"输入不合法  >";
+            }
+        }
+        return mes;
+    }
     /**
      * 修改 入网用户信息
      *
@@ -687,11 +708,35 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isEmpty(id)){
             return Result.error("ID不能为空");
         }
+        if (businessReminderCard.getNewPhone().contains("*")){
+            return Result.error("修改时新办手机号必须重新输入，不可出现*号");
+        }
+
+        String newPhone = businessReminderCard.getNewPhone();
+        String[] split = newPhone.split(",");
+        Set<String>set =new HashSet();
+        for (String s : split) {
+            if (StringUtils.isEmpty(s)){
+                return Result.error("有未输入新办手机号");
+            }
+            set.add(s);
+        }
+        if (set.size()!=split.length){
+            return Result.error("新办号码 不可重复!");
+        }
+        String s = phoneCheck(businessReminderCard.getNewPhone());
+        if (!s.isEmpty()){
+            return Result.error(s);
+        }
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
         BusinessReminderCard byId = businessReminderCardService.getById(businessReminderCard.getId());
         businessReminderCard.setCardNo(byId.getCardNo());
         businessReminderCard.setCardName(byId.getCardName());
-        businessReminderCard.setPhone(byId.getPhone());
+        if (byId.getPhone().contains("*")){
+            businessReminderCard.setPhone(byId.getPhone());
+        }else {
+            businessReminderCard.setPhone(businessReminderCard.getPhone());
+        }
         businessReminderCard.setStatus("0");
         boolean updateById = businessReminderCardService.updateById(businessReminderCard);