企业认证加邮箱,修改时间提示

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

@@ -254,7 +254,7 @@ public class OwnAuthController extends BaseController {
         }
         //到期时间
         String scyEndTime = CommonUtil.objToString(map.get("scyEndTime"));
-        if(CommonUtil.isEmpty(scyEndTime)||"--".equals(scyEndTime)){
+        if(CommonUtil.isEmpty(scyEndTime)||"--".equals(scyEndTime)||"永久".equals(scyEndTime)){
             return R.fail("营业期限不能为空");
         }
         //企业地址
@@ -315,6 +315,14 @@ public class OwnAuthController extends BaseController {
         if(!RegularUtil.phone(phoneNumber)){
             throw new Exception("复核人员联系电话格式不正确!");
         }
+        //邮箱
+        String email = CommonUtil.objToString(map.get("email"));
+        if(CommonUtil.isEmpty(email)){
+            return R.fail("邮箱不能为空");
+        }
+        if(!RegularUtil.email(email)){
+            throw new Exception("邮箱格式不正确!");
+        }
         //其他操作员
         String operator =CommonUtil.objToString(map.get("operator"));
         //其他操作员手机号
@@ -553,6 +561,7 @@ public class OwnAuthController extends BaseController {
             }else{
                 sysUser.setNickName(scyLegal);
             }
+            sysUser.setEmail(email);
             sysUser.setRoleIds(roleIds);
             userService.updateUser(sysUser);
             LambdaQueryWrapper<SysUserCompanyRel> sysuserCompany =new LambdaQueryWrapper();
@@ -605,6 +614,7 @@ public class OwnAuthController extends BaseController {
             if(handlerUser == null){
                 SysUser sysUser = new SysUser();
                 sysUser.setUserName(phoneNumber);
+                sysUser.setEmail(email);
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUser.setNickName(handler);
                 }else{
@@ -646,6 +656,7 @@ public class OwnAuthController extends BaseController {
                 }else{
                     sysUser.setNickName(scyLegal);
                 }
+                sysUser.setEmail(email);
                 userService.updateUser(sysUser);
                 // 新增角色
                 handlerUser.setCompanyId(scyId);

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

@@ -23,7 +23,8 @@ public class RegularUtil {
     private static final String SPECIAL  ="^([\\u4e00-\\u9fa5]|[a-zA-Z0-9])+$";
     //企业名称校验
     private static final String COMPANYNAME  ="^[0-9A-Z\\u4E00-\\u9FFF《》()（）-]+$";
-
+    //邮箱验证码
+    private static final String EMAIL  ="^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$";
     //经办人校验
     private static final String HANDLER  ="^(?!.*\\..*\\.)[\\u4e00-\\u9fa5]([\\u4e00-\\u9fa5\\.]*|[A-Za-z\\.]*)$";
 
@@ -117,6 +118,16 @@ public class RegularUtil {
      * @param str
      * @return
      */
+    public static boolean email(String str) {
+        Pattern pattern = Pattern.compile(EMAIL);
+        Matcher match = pattern.matcher(str);
+        return match.matches();
+    }
+    /**
+     *经办人校验
+     * @param str
+     * @return
+     */
     public static boolean handler(String str) {
         Pattern pattern = Pattern.compile(HANDLER);
         Matcher match = pattern.matcher(str);