From 9b3767a954baba7bc62dd74f75c63c693eac4a2c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 21 八月 2022 22:53:57 +0800
Subject: [PATCH] 优化多角色数据权限匹配规则
---
ruoyi-ui/src/views/system/role/index.vue | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 339ab4e..0681d3d 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -254,9 +254,8 @@
</template>
<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
export default {
name: "Role",
@@ -364,12 +363,6 @@
this.menuOptions = response.data;
});
},
- /** 查询部门树结构 */
- getDeptTreeselect() {
- deptTreeselect().then(response => {
- this.deptOptions = response.data;
- });
- },
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
@@ -396,8 +389,8 @@
});
},
/** 根据角色ID查询部门树结构 */
- getRoleDeptTreeselect(roleId) {
- return roleDeptTreeselect(roleId).then(response => {
+ getDeptTree(roleId) {
+ return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts;
return response;
});
@@ -543,12 +536,12 @@
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
- const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
+ const deptTreeSelect = this.getDeptTree(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
this.$nextTick(() => {
- roleDeptTreeselect.then(res => {
+ deptTreeSelect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});
--
Gitblit v1.9.2