From fcaa364c536c51af95edc1dc04fd1d4bae7e7ebb Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 16 Dec 2022 15:03:23 +0800
Subject: [PATCH] user

---
 .../main/java/org/nl/system/service/dept/dao/SysDept.java  | 6 +++---
 nladmin-ui/src/views/system/user/index.vue                 | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
index 557e04d..1467961 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
@@ -26,13 +26,13 @@ public class SysDept implements Serializable {
     /**
      * ID
      */
-    @TableId(value = "dept_id", type = IdType.AUTO)
-    private Long deptId;
+    @TableId(value = "dept_id", type = IdType.NONE)
+    private String deptId;
 
     /**
      * 上级部门
      */
-    private Long pid;
+    private String pid;
 
     /**
      * 子部门数目
diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index 653dd32..63c59a7 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -167,7 +167,7 @@
             align="center"
             width="200"
           >
-            <template v-if="scope.row.userId !== 1" slot-scope="scope">
+            <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
               <el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
@@ -312,8 +312,8 @@
         <el-table-column prop="personName" label="用户名称" min-width="100" show-overflow-tooltip />
       </el-table>
     </el-dialog>
-    <relevance-user-dialog :dialog-show.sync="relevanceUser" :is-single="false" :users="userIds" @selectUsers="selectUsers" />
-    <relevance-dept-dialog :dialog-show.sync="relevanceDept" :is-single="false" :depts="deptIds" @selectDepts="selectDepts" />
+    <!--    <relevance-user-dialog :dialog-show.sync="relevanceUser" :is-single="false" :users="userIds" @selectUsers="selectUsers" />-->
+    <!--    <relevance-dept-dialog :dialog-show.sync="relevanceDept" :is-single="false" :depts="deptIds" @selectDepts="selectDepts" />-->
   </div>
 </template>
 
@@ -476,6 +476,7 @@ export default {
       userRoles = []
       const _this = this
       if (form.roles !== null && form.roles.length > 0) {
+        debugger
         form.roles.forEach(function(role, index) {
           _this.roleDatas.push(role)
           const rol = { id: role }