From 4ad2f089780e34bfe0611b99285b76c2d30fa0f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 12 May 2021 13:56:44 +0800
Subject: [PATCH] screen-manage                   更改单位转换显示公式

---
 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 41a065c..3deaf39 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>
 
 
@@ -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