From 92786e22bbc0c6d99fac274bfa67d09c6772597a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期二, 10 九月 2024 11:10:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/se-cloud
---
se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 96e77e2..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
@@ -26,10 +26,11 @@
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="remark" column="remark" />
+ <result property="mark" column="mark" />
</resultMap>
<sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+ select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, mark
from sys_menu
</sql>
@@ -50,13 +51,13 @@
</select>
<select id="selectMenuTreeAll" 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
+ 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 where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<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
+ 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
@@ -73,18 +74,41 @@
</if>
order by m.parent_id, m.order_num
</select>
-
- <select id="selectMenuTreeByUserId" parameterType="Long" 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
+
+ <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>
-
+
+ <select id="selectMenusByUserIdAndMark" 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 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}
+ </if>
+ order by m.parent_id, m.order_num
+ </select>
+
<select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id
from sys_menu m
@@ -152,6 +176,7 @@
<if test="icon !=null and icon != ''">icon = #{icon},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ <if test="mark != null and mark != ''">mark = #{mark},</if>
update_time = sysdate()
</set>
where menu_id = #{menuId}
@@ -176,6 +201,7 @@
<if test="icon != null and icon != ''">icon,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="mark != null and mark != ''">mark,</if>
create_time
)values(
<if test="menuId != null and menuId != 0">#{menuId},</if>
@@ -195,6 +221,7 @@
<if test="icon != null and icon != ''">#{icon},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="mark != null and mark != ''">#{mark},</if>
sysdate()
)
</insert>
--
Gitblit v1.9.3