企业认证修改

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

@@ -292,12 +292,17 @@ public class OwnAuthController extends BaseController {
             return R.fail("经办人手机号不能为空");
         }
         if(!RegularUtil.phone(phoneNumber)){
-            throw new Exception("经办人电话格式错误!");
+            throw new Exception("复核人员联系电话格式不正确!");
         }
         //其他操作员
         String operator =CommonUtil.objToString(map.get("operator"));
         //其他操作员手机号
         String number =CommonUtil.objToString(map.get("number"));
+        if(CommonUtil.isNotEmpty(number)){
+            if(!RegularUtil.phone(number)){
+                throw new Exception("业务操作员联系电话格式不正确!");
+            }
+        }
         //备注
         String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));
         //营业执照
@@ -664,8 +669,6 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrDeptId(deptId);
                 sysUserCompanyRel.setSucrHandler("0");
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
-            }else{
-                throw new Exception("复核人员与业务操作员数据不能一致");
             }
         }
         // 刷新登录用户菜单和权限

tianhu-system/src/main/java/com/tianhu/system/domain/OwnSysUser.java

@@ -125,10 +125,29 @@ public class OwnSysUser extends BaseEntity {
     private Long[] postIds;
     private String beginTime;
     private String endTime;
+    private String frozen_second;
+    private Date frozen_date;
+
 
     public OwnSysUser() {
     }
 
+    public String getFrozen_second() {
+        return frozen_second;
+    }
+
+    public void setFrozen_second(String frozen_second) {
+        this.frozen_second = frozen_second;
+    }
+
+    public Date getFrozen_date() {
+        return frozen_date;
+    }
+
+    public void setFrozen_date(Date frozen_date) {
+        this.frozen_date = frozen_date;
+    }
+
     public OwnSysUser(String userId) {
         this.userId = userId;
     }

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -374,9 +374,10 @@ public class SysUserServiceImpl implements ISysUserService
         Long userId = Long.valueOf(user.getUserId());
         Map<String, Object> param = new HashMap<>();
         param.put("userId", userId);
-        param.put("companyId", user.getCompanyId());
+//        param.put("companyId", user.getCompanyId());
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(param);
+//        userRoleMapper.deleteUserRoleByUserId(param);
+        userRoleMapper.deleteSysUserRoleById(userId);
         // 新增用户与角色管理
         insertUserRoles(user);
         return userMapper.updateUser(user);

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= "^(\\\\+?\\\\d{2,4})?-?(\\\\d{3,4})?-?\\\\d{7,8}-?(\\\\d{1,4})?$";
+    private static final String LANDLINE= "^[0][0-9]{2,3}-[0-9]{5,10}$";
     //社会统一信用代码
     private static final String SOCIAL = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$";
     //特殊字符