徐明浩

用户管理增加员工编号、姓名搜索项
用户管理去除手机号码唯一校验

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

@@ -151,11 +151,12 @@ public class SysUserController extends BaseController
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        /*if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
-        else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        else */
+            if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }

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

@@ -38,6 +38,26 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item :label="$t('员工编号')" prop="staffId">
+            <el-input
+              v-model="queryParams.staffId"
+              :placeholder="$t('请输入') + $t('员工编号')"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('姓名')" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              :placeholder="$t('请输入') + $t('姓名')"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item :label="$t('手机号码')" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
@@ -487,7 +507,9 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
+        nickName:undefined,
+        staffId:undefined
       },
       // 表单校验
       rules: {