From 8acb322d4933977edfc7d3fcd37cd59c2e9590cb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Sep 2020 18:10:26 +0800
Subject: [PATCH] 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 83d161e..051eea4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -82,12 +82,14 @@
order by m.parent_id, m.order_num
</select>
- <select id="selectMenuListByRoleId" parameterType="Long" resultType="Integer">
- select m.menu_id, m.parent_id
+ <select id="selectMenuListByRoleId" resultType="Integer">
+ select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
- and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+ <if test="menuCheckStrictly">
+ and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+ </if>
order by m.parent_id, m.order_num
</select>
--
Gitblit v1.9.3