From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml b/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
index 793f1c3..1151d3a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
@@ -22,6 +22,7 @@
<result property="labelId" column="label_id" />
<result property="background" column="background" />
<result property="labelStr" column="label_str" />
+ <result property="menuType" column="menu_type"/>
</resultMap>
<resultMap id="menuVOResultMap" type="org.springblade.modules.system.vo.MenuVO">
@@ -37,6 +38,7 @@
<result column="action" property="action"/>
<result column="is_open" property="isOpen"/>
<result column="remark" property="remark"/>
+ <result property="menuType" column="menu_type"/>
<result column="is_deleted" property="isDeleted"/>
<result column="has_children" property="hasChildren"/>
</resultMap>
@@ -68,7 +70,8 @@
picture_img,
label_id,
background,
- label_str
+ label_str,
+ menu_type
from
blade_menu
</sql>
@@ -137,7 +140,10 @@
</select>
<select id="allMenu" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and category = 1 and name != 'app'
+ select *
+ from blade_menu
+ where is_deleted = 0
+ and category = 1
</select>
<select id="roleMenu" resultMap="menuResultMap">
@@ -156,9 +162,9 @@
</select>
<select id="roleMenuByRoleId" resultMap="menuResultMap">
- select * from blade_menu where is_deleted = 0 and id IN
+ select * from blade_menu where is_deleted = 0 and menu_type = #{param2} and id IN
( SELECT menu_id FROM blade_role_menu WHERE role_id IN
- <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+ <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
)
--
Gitblit v1.9.3