From c1036a3df288855348a0e9a085f269b3037d85f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 二月 2023 22:45:08 +0800
Subject: [PATCH] fix 修复 TenantSaTokenDao 内部调用导致 key 错误问题

---
 ruoyi-ui/src/views/system/user/index.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 72bb942..0fcb4d9 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -20,6 +20,7 @@
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
+            node-key="id"
             default-expand-all
             highlight-current
             @node-click="handleNodeClick"
@@ -179,9 +180,7 @@
                 v-hasPermi="['system:user:remove']"
               >鍒犻櫎</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
-                </span>
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
@@ -415,7 +414,7 @@
       },
       // 鍒椾俊鎭�
       columns: [
-        { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: true },
+        { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false },
         { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
         { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
         { key: 3, label: `閮ㄩ棬`, visible: true },
@@ -536,6 +535,8 @@
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -576,8 +577,8 @@
         this.form = response.data.user;
         this.postOptions = response.data.posts;
         this.roleOptions = response.data.roles;
-        this.form.postIds = response.data.postIds;
-        this.form.roleIds = response.data.roleIds;
+        this.$set(this.form, "postIds", response.data.postIds);
+        this.$set(this.form, "roleIds", response.data.roleIds);
         this.open = true;
         this.title = "淇敼鐢ㄦ埛";
         this.form.password = "";

--
Gitblit v1.9.3