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 @@ @@ -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: '角色不能为空',