From 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 11:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/resources/mapper/MenuMapper.xml |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index ad782b3..6acf572 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -12,9 +12,6 @@
                 <if test="record.parentId != null">
                     and a.parent_id = #{record.parentId}
                 </if>
-                <if test="record.belongId != null">
-                    and a.belong_id = #{record.belongId}
-                </if>
             </if>
         </where>
         order by a.create_time desc
@@ -31,7 +28,13 @@
         SELECT
             a.*
         FROM
-            t_menu a where a.parent_id = #{parentId} and a.belong_id = #{belongId}
+            t_menu a
+
+        <where>
+                <if test="parentId != null">
+                    and a.parent_id = #{parentId}
+                </if>
+        </where>
     </select>
 
     <select id="selectMenuEntityByIdAndParentId" resultType="com.xcong.farmer.cms.modules.system.entity.MenuEntity">
@@ -41,4 +44,22 @@
             t_menu a where a.parent_id != #{parentId} and a.id = #{menuId}
     </select>
 
+    <select id="selectAdminUserMenuVoOrderByOrderNum" resultType="com.xcong.farmer.cms.modules.system.vo.AdminUserMenuVo">
+        select a.* from t_menu a
+        where a.id IN
+        <foreach collection = "list" item = "item"  separator=","  open = "(" close = ")" >
+            #{item}
+        </foreach >
+        order by a.order_num ASC
+    </select>
+
+    <select id="selectAdminMenuVoOrderByOrderNum" resultType="com.xcong.farmer.cms.modules.system.vo.AdminMenuVo">
+        select a.* from t_menu a
+        where a.id IN
+        <foreach collection = "list" item = "item"  separator=","  open = "(" close = ")" >
+            #{item}
+        </foreach >
+        order by a.order_num ASC
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1