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 9861e3b1..e3211c5f 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ 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); - } - }); }); } /** 树权限(展开/折叠)*/