From 9e931b0b752b429827195899bc6f2fe461ae46c5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 九月 2024 21:36:47 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
index aee2c98..f5e0ae9 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -75,14 +75,20 @@
order by m.parent_id, m.order_num
</select>
- <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+ <select id="selectMenuTreeByUserId" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.mark
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
+ where m.menu_type in ('M', 'C') and m.status = 0 and ro.status = 0
+ <if test="userId != null and userId != ''">
+ and u.user_id = #{userId}
+ </if>
+ <if test="mark != null and mark != ''">
+ and m.mark = #{mark}
+ </if>
order by m.parent_id, m.order_num
</select>
@@ -93,9 +99,12 @@
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C', 'F') and m.status = 0 AND ro.status = 0
+ where m.menu_type in ('M', 'C', 'F') and m.status = 0 and ro.status = 0
+ <if test="userId != null and userId != ''">
+ and u.user_id = #{userId}
+ </if>
<if test="mark != null and mark != ''">
- AND m.mark = #{mark}
+ and m.mark = #{mark}
</if>
order by m.parent_id, m.order_num
</select>
--
Gitblit v1.9.3