链属修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -779,7 +779,7 @@ public class OwnAuthController extends BaseController {
         //查询链属公司信息
         LambdaQueryWrapper<SysCompanySpare> companySpare = new LambdaQueryWrapper<>();
         companySpare.eq(SysCompanySpare::getScpSocialCode,company.getScySocialCode());
-        companySpare.and(f -> f.eq(SysCompanySpare::getScpRelId,null).or().eq(SysCompanySpare::getScpRelId,""));
+        companySpare.and(f -> f.isNull(SysCompanySpare::getScpRelId).or().eq(SysCompanySpare::getScpRelId,""));
         List<SysCompanySpare>  sysCompanySpare =  sysCompanySpareService.findSysCompanySpares(companySpare);
         //新增链属关系
         for(int i = 0;i<sysCompanySpare.size();i++){

tianhu-system/src/main/java/com/tianhu/system/utils/RegularUtil.java

@@ -16,7 +16,7 @@ public class RegularUtil {
     //手机号
     private static final String REGMOBILE= "^1[3|4|5|6|7|8|9][0-9]\\d{8}$";
     //座机号
-    private static final String LANDLINE= "^[0][0-9]{2,3}-[0-9]{5,10}$";
+    private static final String LANDLINE= "^(\\+?\\d{2,4})?-?(\\d{3,4})?-?\\d{7,8}-?(\\d{1,4})?$";
     //社会统一信用代码
     private static final String SOCIAL = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$";
     //特殊字符