From 158ac9bdc5d184a4dca8ff30755186f5ca2db771 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 30 十月 2023 11:58:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index bda18b0..e2cdeb6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -73,7 +73,7 @@
ORDER BY menu.sort
</select>
- <select id="lazyMenuList" resultMap="menuVOResultMap">
+ <select id="lazyMenuPage" resultMap="menuVOResultMap">
SELECT
menu.*,
(
@@ -221,7 +221,13 @@
</select>
<select id="grantTree" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where is_deleted = 0 order by sort
+ select
+ id,
+ parent_id,
+ name as title,
+ id as "value",
+ id as "key"
+ from pl_sys_menu where is_deleted = 0 order by sort
</select>
<select id="grantTreeByRole" resultMap="treeNodeResultMap">
@@ -475,4 +481,22 @@
GROUP BY m.path
</select>
+ <select id="selectMenuChildByBtnType" resultMap="menuResultMap">
+ select pm.*
+ from pl_sys_menu ps, pl_sys_menu pm
+ where pm.is_deleted = 0
+ and ps.category = 1
+ and ps.CODE = #{btmType}
+ and ps.ID = pm.PARENT_ID
+ <if test="roleIds != null and roleIds != ''">
+ and ps.ID in (
+ SELECT menu_id FROM pl_org_role_menu WHERE role_id IN
+ <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ order by pm.sort asc
+ </select>
+
</mapper>
--
Gitblit v1.9.3