From bc6aaea416da40038dee2df1b3de4a1581da2a48 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Jul 2020 10:07:44 +0800
Subject: [PATCH] 臭氧预测update,根据城市名查询预测和实际数据

---
 src/main/resources/mapper/MenuMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index d9e91d8..79a4df8 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -110,14 +110,19 @@
         </if>
     </select>
 
-    <select id="getMenuListByName" resultMap="ResultMap">
+    <select id="getMenuListInfo" resultMap="ResultMap">
         select
         <include refid="Base_Column_List"/>
         from menu
         where is_delete=0
-        <if test="menuName != 'null'">
-            and menu_name like concat('%',#{menuName},'%')
-        </if>
+    </select>
+
+    <select id="getMenuOrdersByRoleId" resultType="java.lang.Integer">
+        select
+        m.menu_order
+        from menu m
+        left join role_menu rm on m.id=rm.menu_id and m.channel_id= rm.channel_id
+        where rm.role_id = #{roleId}
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0