From 5828f5987bd60e8bd2b09295cfe334d7446181e4 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Wed, 16 Nov 2022 20:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/modules/system/domain/User.java     |  3 ---
 .../system/service/impl/UserServiceImpl.java   |  1 +
 mes/qd/src/views/system/user/index.vue         | 18 +-----------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
index 232ba246..e8d81546 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
@@ -77,12 +77,9 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "用户昵称")
     private String nickName;
 
-    @Email
-    @NotBlank
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @NotBlank
     @ApiModelProperty(value = "电话号码")
     private String phone;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
index 6b2e6c19..7d516cbd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
@@ -119,6 +119,7 @@ public class UserServiceImpl implements UserService {
             redisUtils.del(CacheKey.MENU_USER + resources.getId());
             redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
         }
+        redisUtils.del("user::username:" + user.getUsername());
         // 如果用户名称修改
         if(!resources.getUsername().equals(user.getUsername())){
             redisUtils.del("user::username:" + user.getUsername());
diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue
index b7ab01cd..29d978ab 100644
--- a/mes/qd/src/views/system/user/index.vue
+++ b/mes/qd/src/views/system/user/index.vue
@@ -173,7 +173,7 @@
           <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
           <el-table-column show-overflow-tooltip prop="dept" label="部门">
             <template slot-scope="scope">
-              <div>{{ scope.row.dept.name }}</div>
+              <div>{{ scope.row.dept?scope.row.dept.name:'-' }}</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="enabled">
@@ -291,13 +291,6 @@ export default {
           { required: true, message: '请输入用户昵称', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
-        email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
-        ],
         password: [
           { max: 20, message: '长度最多 20 个字符', trigger: 'change' }
         ]
@@ -357,9 +350,6 @@ export default {
       this.jobDatas = []
       this.roleDatas = []
     },
-    [CRUD.HOOK.afterRefresh]() {
-      console.log(this.crud.data)
-    },
     // 初始化编辑时候的角色与岗位
     [CRUD.HOOK.beforeToEdit](crud, form) {
       this.getJobs(this.form.dept.id)
@@ -387,12 +377,6 @@ export default {
           type: 'warning'
         })
         return false
-      } else if (this.jobDatas.length === 0) {
-        this.$message({
-          message: '岗位不能为空',
-          type: 'warning'
-        })
-        return false
       } else if (this.roleDatas.length === 0) {
         this.$message({
           message: '角色不能为空',