From 80f54319f276acc17c864581481f4c5872073adb Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 10 Jun 2020 13:23:57 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/mapper/MenuMapper.xml  | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 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 3f71330c..e5d7269b 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
@@ -139,44 +139,23 @@
 
     <select id="allButtons" resultMap="menuResultMap">
         SELECT
-            *
+            id,
+            parent_id,
+            CODE,
+            NAME,
+            alias,
+            path,
+            source,
+            action,
+            sort
         FROM
+            blade_menu
+        WHERE
             (
-                SELECT
-                    id,
-                    parent_id,
-                    CODE,
-                    NAME,
-                    alias,
-                    path,
-                    source,
-                    action,
-                    sort
-                FROM
-                    blade_menu
-                WHERE
-                    id IN ( SELECT parent_id FROM blade_menu WHERE is_deleted = 0 AND category = 2 )
-
-                UNION ALL
-
-                SELECT
-                    id,
-                    parent_id,
-                    CODE,
-                    NAME,
-                    alias,
-                    path,
-                    source,
-                    action,
-                    sort
-                FROM
-                    blade_menu
-                WHERE
-                    is_deleted = 0
-                  AND category = 2
-            ) menu
-        ORDER BY
-            sort
+                category = 2 OR id IN ( SELECT parent_id FROM blade_menu WHERE is_deleted = 0 AND category = 2 )
+            )
+          AND is_deleted = 0
+        ORDER BY sort
     </select>
 
     <select id="buttons" resultMap="menuResultMap">