From 81ecb884d3297db50744c7f0b403a1e14a7533af Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 16 Jul 2019 16:26:43 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E6=8C=89=E9=92=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/mapper/MenuMapper.xml  | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index 4cfecfcf..6b6017fb 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -67,46 +67,48 @@
     </select>
 
     <select id="buttons" resultMap="menuResultMap">
-        SELECT
-            id,
-            parent_id,
-            `code`,
-            `name`,
-            alias,
-            path,
-            source,
-            action,
-            sort
-        FROM
-            blade_menu
-        WHERE
-            is_deleted = 0 and id IN (
-              SELECT parent_id FROM blade_menu
-              WHERE ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
-                <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-              ) ) )
+        SELECT * FROM (
+            SELECT
+                id,
+                parent_id,
+                `code`,
+                `name`,
+                alias,
+                path,
+                source,
+                action,
+                sort
+            FROM
+                blade_menu
+            WHERE
+                is_deleted = 0 and id IN (
+                  SELECT parent_id FROM blade_menu
+                  WHERE ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+                    <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                  ) ) )
 
-        UNION ALL
+            UNION ALL
 
-        SELECT
-            id,
-            parent_id,
-            `code`,
-            `name`,
-            alias,
-            path,
-            source,
-            action,
-            sort
-        FROM
-            blade_menu
-        WHERE
-            is_deleted = 0 and  category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
-            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>)
+            SELECT
+                id,
+                parent_id,
+                `code`,
+                `name`,
+                alias,
+                path,
+                source,
+                action,
+                sort
+            FROM
+                blade_menu
+            WHERE
+                is_deleted = 0 and  category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+                <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>)
+        ) menu ORDER BY sort
     </select>
 
     <select id="grantTree" resultMap="treeNodeResultMap">