From e7bc156f901b06e5af54cfe86fe53e7491af7b7f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 41a065c..56e6c5d 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -13,6 +13,7 @@
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="is_delete" property="isDelete"/>
+ <result column="desc" property="desc"/>
</resultMap>
@@ -31,7 +32,7 @@
join
manage_role_menu mrm
on
- mm.`id` = mrm.`menu_id` and mm.`is_delete`=0
+ mm.`id` = mrm.`menu_id` and mrm.`is_delete`=0
join
manage_role mr
on
@@ -67,7 +68,7 @@
<if test="icon != null">
icon,
</if>
- <if test="parent_id != null">
+ <if test="parentId != null">
parent_id,
</if>
<if test="order != null">
@@ -84,8 +85,8 @@
<if test="icon != null">
#{icon},
</if>
- <if test="parent_id != null">
- #{parent_id},
+ <if test="parentId != null">
+ #{parentId},
</if>
<if test="order != null">
#{order},
@@ -123,6 +124,7 @@
<include refid="Base_Column_List"></include>
from manage_menu mm
where mm.is_delete = 0
+ ORDER BY parent_id ASC,`order` ASC
limit #{start},#{number}
</select>
@@ -153,4 +155,27 @@
WHERE mm.is_delete = 0
</select>
+ <select id="getManageMenuByCondition" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_menu mm
+ where mm.is_delete = 0
+ <if test="name != null">
+ and mm.name = #{name}
+ </if>
+ <if test="url != null">
+ and mm.url = #{url}
+ </if>
+ <if test="icon != null">
+ and mm.icon = #{icon}
+ </if>
+ <if test="parent_id != null">
+ and mm.parent_id = #{parent_id}
+ </if>
+ <if test="order != null">
+ and mm.order = #{order}
+ </if>
+ limit #{start},#{number}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0