From 450db962c4bc94de0cb0aacf47ba12ec314961d3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 08 十二月 2023 11:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 ff6e118..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
@@ -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">
@@ -477,11 +483,20 @@
<select id="selectMenuChildByBtnType" resultMap="menuResultMap">
select pm.*
- from pl_sys_menu ps, pl_sys_menu 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 order by pm.sort asc
+ 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