From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/resources/mapper/MenuMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index fdffd4c..79a4df8 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -104,19 +104,25 @@
from menu
where id IN
(select distinct(menu_parent_Id) from menu
- where menu_parent_Id is not null)
+ where menu_parent_Id <![CDATA[ <> ]]> 0)
<if test="menuName != 'null'">
and menu_name like concat('%',#{menuName},'%')
</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