From b4d75efaf8dcf280f7e0e7297ceda518e5030d32 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 30 一月 2024 16:52:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 7 +++++--
1 files changed, 5 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 68dd8a2..0ec2a53 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
@@ -531,7 +531,7 @@
<select id="getButtonByIdsOrByParentCode" resultMap="menuResultMap">
SELECT
- pm.*
+ DISTINCT pm.*
FROM
PL_SYS_MENU pm
<if test="code != null and code != ''">
@@ -550,7 +550,10 @@
</if>
<if test="roleIds != null and roleIds != ''">
AND pm.ID = prom.MENU_ID
- AND prom.ROLE_ID in (#{roleIds})
+ AND prom.ROLE_ID IN
+ <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="ids != null and ids != ''">
AND pm.ID IN
--
Gitblit v1.9.3