From 40f6aa11c2899ea8c13c7cf66bc1981bdd7d141a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 25 May 2021 13:51:50 +0800
Subject: [PATCH] screen-manage                更改数据库连接地址

---
 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 1ba6ee4..64a0bd7 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -13,11 +13,12 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="is_delete" property="isDelete"/>
+        <result column="desc" property="desc"/>
     </resultMap>
 
 
     <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>
 
 
@@ -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,11 +68,14 @@
             <if test="icon != null">
                 icon,
             </if>
-            <if test="parent_id != null">
+            <if test="parentId != null">
                 parent_id,
             </if>
             <if test="order != null">
                 `order`,
+            </if>
+            <if test="desc != null">
+                `desc`,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -84,11 +88,14 @@
             <if test="icon != null">
                 #{icon},
             </if>
-            <if test="parent_id != null">
-                #{parent_id},
+            <if test="parentId != null">
+                #{parentId},
             </if>
             <if test="order != null">
                 #{order},
+            </if>
+            <if test="desc != null">
+                #{desc},
             </if>
         </trim>
     </insert>
@@ -114,6 +121,9 @@
             <if test="is_delete != null">
                 is_delete = #{is_delete},
             </if>
+            <if test="desc != null">
+                `desc` = #{desc},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -123,6 +133,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>
 
@@ -142,4 +153,41 @@
         limit #{start},#{number}
     </select>
 
+    <select id="getManageMenuByRoleId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"></include>
+        FROM manage_menu mm
+        JOIN manage_role_menu mrm
+        ON mm.id = mrm.menu_id AND mrm.is_delete = 0
+        JOIN manage_role mr
+        ON mr.id = mrm.role_id and mr.id = #{roleId}
+        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>
+        <if test="desc != null">
+            and mm.desc = #{order}
+        </if>
+        limit #{start},#{number}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0