From c63f9de5c51bd577b268d572eee3c1b774dfe04a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 16 Sep 2022 19:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yi-sqlsugar-dev.db                        | Bin 151552 -> 151552 bytes
 .../src/views/system/role/index.vue           |  22 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index 9861e3b1b5ad8636772619ab75602312ff8f2098..e3211c5fe3759b5d3decc383ffec6a3f8252c8d4 100644
GIT binary patch
delta 428
zcmZozz}c{XbAmMEzlk!=jQ=(!T!_`Ov@$TZGPTe%GO{o;HZU_XFf!6Lu+%j)Q!qqG
zSsEK!nl(qoZI6m$T(wbxllKw>{~`Vsem8y&zEgZXe13cayq9>VY*tjL=B@w1#=v0B
z00wNLXCf1uoCKIf*`oh$a1vlZHr~R@)ZEI%OwYu`Nc2SA@i$EZ3^ts+Y$&>;&dg{M
zV8W&w?l>gf93b8GNS1@OGZNOmI{{=lJ2uN12<Ya0ux<156b1$xHmL6HQ{|ZQ8K<)}
oFp4wQ14AT@U(W;<3|u_SY>c93Aim;6;xKX`INLYqGX*FB0I5=Hga7~l

delta 335
zcmZozz}c{XbAmMEuZc3wjK4M}T!_`Ourf8WGO*M$H#0IdH!?ReFf!6Lu+%j)Q!qqG
z8JiiI8#hPAZI6m$T(wb*gHM2g{}6u*zZ*XX-zmNxK0iJI-b<Sm6?XI1?_y(Mux0=Q
zHqkS|OP4YUFp087|J~puz<_GFv5}RDv7WJsrRa&e-3d(s3^p9RY$&=TBz7|iFk;sY
zb+x&%=!x{n`G<hI*+IGukSqslXCR<`dy5=X1LJg-1B@a}{5?QFl=3U8!yL}Z!_3Ag
RdIsVS4g_cW27RUg1ppuiPUQdq

diff --git a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
index 194a43b8..3650904e 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue
@@ -601,9 +601,9 @@ function getRoleMenuTreeselect(roleId) {
     response.data.forEach((m) => {
       menuIds.push(m.id);
     });
-  
-      nextTick(() => {
-        menuIds.forEach((v) => {
+
+    nextTick(() => {
+      menuIds.forEach((v) => {
         menuRef.value.setChecked(v, true, false);
       });
 
@@ -626,17 +626,15 @@ function getDeptTree(roleId) {
     });
     deptOptions.value = proxy.handleTree(selectList, "id");
 
-    const deptIds = [];
+    let deptIds = [];
     roleDeptTreeselect(roleId).then((response) => {
-
-      deptIds=  response.data.map((x) => x.id)
+      deptIds = response.data.map((x) => x.id);
+      // nextTick(() => {
+        if (deptRef.value) {
+          deptRef.value.setCheckedKeys(deptIds);
+        }
+      // });
     });
-
-    nextTick(() => {
-      if (deptRef.value) {
-        deptRef.value.setCheckedKeys(deptIds);
-      }
-     });
   });
 }
 /** 树权限（展开/折叠）*/