From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 3deaf39..fecfa44 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -18,7 +18,7 @@
<sql id="Base_Column_List">
- mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
+ mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
</sql>
@@ -32,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
@@ -74,6 +74,9 @@
<if test="order != null">
`order`,
</if>
+ <if test="desc != null">
+ `desc`,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">
@@ -90,6 +93,9 @@
</if>
<if test="order != null">
#{order},
+ </if>
+ <if test="desc != null">
+ #{desc},
</if>
</trim>
</insert>
@@ -114,6 +120,9 @@
</if>
<if test="is_delete != null">
is_delete = #{is_delete},
+ </if>
+ <if test="desc != null">
+ `desc` = #{desc},
</if>
</set>
where id = #{id}
@@ -175,6 +184,35 @@
<if test="order != null">
and mm.order = #{order}
</if>
+ <if test="desc != null">
+ and mm.desc = #{order}
+ </if>
+ limit #{start},#{number}
+ </select>
+
+ <select id="getManageMenuByNameFuzzy" parameterType="java.util.Map" 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 like concat('%',#{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>
+ <if test="desc != null">
+ and mm.desc = #{order}
+ </if>
limit #{start},#{number}
</select>
--
Gitblit v1.8.0