From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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