From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: Fri, 31 Jul 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/src/views/system/role/index.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 658efc6..dddc906 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -91,7 +91,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:post:export']"
+ v-hasPermi="['system:role:export']"
>导出</el-button>
</el-col>
</el-row>
@@ -368,16 +368,16 @@
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
- roleMenuTreeselect(roleId).then(response => {
+ return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
- this.$refs.menu.setCheckedKeys(response.checkedKeys);
+ return response;
});
},
/** 根据角色ID查询部门树结构 */
getRoleDeptTreeselect(roleId) {
- roleDeptTreeselect(roleId).then(response => {
+ return roleDeptTreeselect(roleId).then(response => {
this.deptOptions = response.depts;
- this.$refs.dept.setCheckedKeys(response.checkedKeys);
+ return response;
});
},
// 角色状态修改
@@ -450,24 +450,30 @@
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
- this.$nextTick(() => {
- this.getRoleMenuTreeselect(roleId);
- });
+ const roleMenu = this.getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
this.form = response.data;
this.open = true;
+ this.$nextTick(() => {
+ roleMenu.then(res => {
+ this.$refs.menu.setCheckedKeys(res.checkedKeys);
+ });
+ });
this.title = "修改角色";
});
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
- this.$nextTick(() => {
- this.getRoleDeptTreeselect(row.roleId);
- });
+ const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
+ this.$nextTick(() => {
+ roleDeptTreeselect.then(res => {
+ this.$refs.dept.setCheckedKeys(res.checkedKeys);
+ });
+ });
this.title = "分配数据权限";
});
},
--
Gitblit v1.9.2