-修改手机号邮箱重复验证

-注释手机号正则表达式

master/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -124,14 +124,14 @@ public class SysUserController extends BaseController
         {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+//        {
+//            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        }
+//        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.insertUser(user));
@@ -166,10 +166,10 @@ public class SysUserController extends BaseController
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         else */
-            if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        /*    if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+        }*/
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }

ui/src/views/system/user/index.vue

@@ -574,11 +574,11 @@ export default {
         ],
         phonenumber: [
           { required: true, message: this.$t('手机号码') + this.$t('不能为空'), trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message:this.$t('请输入正确的手机号码') ,
-            trigger: "blur"
-          }
+          // {
+          //   pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          //   message:this.$t('请输入正确的手机号码') ,
+          //   trigger: "blur"
+          // }
         ]
       }
     };