From ffb6165616939485439cc1243c30b3b36f079f21 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Thu, 17 Nov 2022 17:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/UserServiceImpl.java  |  8 +--
 mes/qd/src/views/system/user/index.vue        | 49 ++++++++++++++-----
 2 files changed, 41 insertions(+), 16 deletions(-)

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 78bf5e81..a6727c6b 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
@@ -101,15 +101,15 @@ public class UserServiceImpl implements UserService {
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
         ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
         User user1 = userRepository.findByUsername(resources.getUsername());
-        User user2 = userRepository.findByEmail(resources.getEmail());
+//        User user2 = userRepository.findByEmail(resources.getEmail());
 
         if (user1 != null && !user.getId().equals(user1.getId())) {
             throw new EntityExistException(User.class, "username", resources.getUsername());
         }
 
-        if (user2 != null && !user.getId().equals(user2.getId())) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }
+//        if (user2 != null && !user.getId().equals(user2.getId())) {
+//            throw new EntityExistException(User.class, "email", resources.getEmail());
+//        }
         // 如果用户的角色改变
         if (!resources.getRoles().equals(user.getRoles())) {
             redisUtils.del(CacheKey.DATA_USER  + resources.getId());
diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue
index f383baf9..d16b4270 100644
--- a/mes/qd/src/views/system/user/index.vue
+++ b/mes/qd/src/views/system/user/index.vue
@@ -70,18 +70,18 @@
         >
           <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
             <el-form-item label="用户名" prop="username">
-              <el-input style="width: 200px;" v-model="form.username" />
+              <el-input v-model="form.username" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="电话" prop="phone">
-              <el-input v-model.number="form.phone" style="width: 200px;"/>
+              <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="昵称" prop="nickName">
-              <el-input v-model="form.nickName" style="width: 200px;"/>
+              <el-input v-model="form.nickName" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" style="width: 200px;"/>
+              <el-input v-model="form.email" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="* 部门" prop="dept.id">
+            <el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
               <treeselect
                 v-model="form.dept.id"
                 :options="depts"
@@ -91,9 +91,9 @@
               />
             </el-form-item>
             <el-form-item label="密码" prop="password">
-              <el-input v-model="form.password" style="width: 200px;"/>
+              <el-input v-model="form.password" style="width: 200px;" show-password/>
             </el-form-item>
-            <el-form-item label="岗位" prop="jobs" v-if="false">
+            <el-form-item v-if="false" label="岗位" prop="jobs">
               <el-select
                 v-model="jobDatas"
                 style="width: 200px"
@@ -127,12 +127,16 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="外部标识" prop="extId">
-              <el-input v-model="form.extId" style="width: 200px;"/>
+              <el-input v-model="form.extId" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="外部用户标识" prop="extId">
-              <el-input v-model="form.extuserId" style="width: 200px;"/>
+              <el-input v-model="form.extuserId" style="width: 200px;" />
             </el-form-item>
-            <el-form-item style="margin-bottom: 0;" label="* 角色" prop="roles">
+            <el-form-item
+              style="margin-bottom: 0;"
+              prop="roles"
+              label="角色"
+            >
               <el-select
                 v-model="roleDatas"
                 style="width: 516px"
@@ -167,7 +171,7 @@
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
           <el-table-column show-overflow-tooltip prop="username" label="用户名" />
           <el-table-column show-overflow-tooltip prop="nickName" label="昵称" />
-<!--          <el-table-column show-overflow-tooltip prop="password" label="密码" />-->
+          <!--          <el-table-column show-overflow-tooltip prop="password" label="密码" />-->
           <el-table-column prop="gender" label="性别" />
           <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
           <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
@@ -292,7 +296,7 @@ export default {
     ])
   },
   created() {
-    this.crud.msg.add = '新增成功，默认密码：123456'
+    this.crud.msg.add = '新增成功'
   },
   mounted: function() {
     const that = this
@@ -365,6 +369,9 @@ export default {
         userJobs.push(data)
       })
     },
+    [CRUD.HOOK.afterRefresh]() {
+      console.log(this.crud.data)
+    },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
       if (!crud.form.dept.id) {
@@ -507,3 +514,21 @@ export default {
   line-height: 30px;
 }
 </style>
+<style scoped>
+  .title{
+    color: #606266;
+    font-family: NotoSansHans-Regula;
+    font-size: 14px;
+    display:inline-block;
+    text-align: right;
+    width: 70px;
+  }
+  .titleRequired:before {
+    content: '*';
+    color: #F56C6C;
+    left: 0px;
+    top: 6px;
+    font-size: 20px;
+    position: absolute;
+  }
+</style>