From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml |   16 ++++++++++++----
 1 files changed, 12 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 2bc6a0f..1151d3a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml
@@ -21,6 +21,8 @@
         <result property="pictureImg"    column="picture_img"    />
         <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">
@@ -36,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>
@@ -66,7 +69,9 @@
             is_deleted,
             picture_img,
             label_id,
-            background
+            background,
+            label_str,
+            menu_type
         from
             blade_menu
     </sql>
@@ -135,7 +140,10 @@
     </select>
 
     <select id="allMenu" resultMap="menuResultMap">
-        select * from blade_menu where is_deleted = 0 and category = 1
+        select *
+        from blade_menu
+        where is_deleted = 0
+          and category = 1
     </select>
 
     <select id="roleMenu" resultMap="menuResultMap">
@@ -154,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