Explorar o código

去除用户手机邮箱部门必填验证

RuoYi %!s(int64=5) %!d(string=hai) anos
pai
achega
3c5893074b

+ 8 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -171,11 +171,13 @@ public class SysUserController extends BaseController
171
         {
171
         {
172
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
172
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
173
         }
173
         }
174
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
174
+        else if (StringUtils.isNotEmpty(user.getPhonenumber())
175
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
175
         {
176
         {
176
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
177
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
177
         }
178
         }
178
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
179
+        else if (StringUtils.isNotEmpty(user.getEmail())
180
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
179
         {
181
         {
180
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
182
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
181
         }
183
         }
@@ -193,11 +195,13 @@ public class SysUserController extends BaseController
193
     public AjaxResult edit(@Validated @RequestBody SysUser user)
195
     public AjaxResult edit(@Validated @RequestBody SysUser user)
194
     {
196
     {
195
         userService.checkUserAllowed(user);
197
         userService.checkUserAllowed(user);
196
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
198
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
199
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
197
         {
200
         {
198
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
201
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
199
         }
202
         }
200
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
203
+        else if (StringUtils.isNotEmpty(user.getEmail())
204
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
201
         {
205
         {
202
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
206
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
203
         }
207
         }

+ 0 - 5
ruoyi-ui/src/views/system/user/index.vue

@@ -421,14 +421,10 @@ export default {
421
         nickName: [
421
         nickName: [
422
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
422
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
423
         ],
423
         ],
424
-        deptId: [
425
-          { required: true, message: "归属部门不能为空", trigger: "blur" }
426
-        ],
427
         password: [
424
         password: [
428
           { required: true, message: "用户密码不能为空", trigger: "blur" }
425
           { required: true, message: "用户密码不能为空", trigger: "blur" }
429
         ],
426
         ],
430
         email: [
427
         email: [
431
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
432
           {
428
           {
433
             type: "email",
429
             type: "email",
434
             message: "'请输入正确的邮箱地址",
430
             message: "'请输入正确的邮箱地址",
@@ -436,7 +432,6 @@ export default {
436
           }
432
           }
437
         ],
433
         ],
438
         phonenumber: [
434
         phonenumber: [
439
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
440
           {
435
           {
441
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
436
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
442
             message: "请输入正确的手机号码",
437
             message: "请输入正确的手机号码",