Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2010,7 +2010,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setClosingDate("-");
             }
             record.setShowFinancialBtn(false);
-            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+            /*LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
             if (null != data) {
                 if (StringUtils.isNotBlank(record.getSaleOrderState())) {
                     if (record.getSaleOrderState().equals("已办结")) {
@@ -2029,7 +2029,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         }
                     }
                 }
-            }
+            }*/
 
 
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1158,8 +1158,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String dtoSid = dto.getSid();
         //手机号
         String phone = dto.getPhone();
-        if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
-            return rb.setMsg("手机号格式不正确");
+        if (StringUtils.isNotBlank(phone)){
+            if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
+                return rb.setMsg("手机号格式不正确");
+            }
         }
         if (!dto.getTaxpayerNo().matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
             return rb.setMsg("证件号码格式不正确");