From 4f7362ec2854732c2ff2454331ec815c4c3147f0 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十一月 2024 11:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud
---
se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 f5e0ae9..92904e2 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
@@ -59,19 +59,26 @@
<select id="selectMenuListByUserId" parameterType="SysMenu" 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
- where ur.user_id = #{params.userId}
- <if test="menuName != null and menuName != ''">
- AND m.menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND m.visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND m.status = #{status}
- </if>
+ 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
+ <where>
+ <if test="menuId != null">
+ ur.user_id = #{menuId}
+ </if>
+ <if test="menuName != null and menuName != ''">
+ AND m.menu_name like concat('%', #{menuName}, '%')
+ </if>
+ <if test="visible != null and visible != ''">
+ AND m.visible = #{visible}
+ </if>
+ <if test="status != null and status != ''">
+ AND m.status = #{status}
+ </if>
+ <if test="mark != null and mark != ''">
+ AND m.mark = #{mark}
+ </if>
+ </where>
order by m.parent_id, m.order_num
</select>
@@ -83,7 +90,7 @@
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 m.menu_type in ('M', 'C') and m.status = 0 and ro.status = 0
- <if test="userId != null and userId != ''">
+ <if test="userId != null">
and u.user_id = #{userId}
</if>
<if test="mark != null and mark != ''">
--
Gitblit v1.9.3