From d8c5ae27acb144999eb7b5a8dc931ce05894c9cf Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 18 Dec 2020 21:47:17 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=E6=8E=88=E6=9D=83=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E5=A4=8Dsqlserver?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/mapper/MenuMapper.xml  | 162 ++++++++++--------
 1 file changed, 88 insertions(+), 74 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 e00cc22a..f4e2f150 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
@@ -313,35 +313,37 @@
 
     <select id="grantDataScopeTreeByRole" resultMap="treeNodeResultMap">
         SELECT
-            *
+        *
         FROM
-            (
-                SELECT
-                    id,
-                    parent_id,
-                    NAME AS title,
-                    id AS "value",
-                    id AS "key"
-                FROM
-                    blade_menu
-                WHERE
-                    category = 1
-                  AND is_deleted = 0
-                  AND id IN ( SELECT menu_id FROM blade_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
-                  AND id IN ( select menu_id from blade_role_menu where role_id in
+        (
+            SELECT
+                id,
+                parent_id,
+                NAME AS title,
+                id AS "value",
+                id AS "key"
+            FROM
+                blade_menu
+            WHERE
+                category = 1
+            AND is_deleted = 0
+            AND id IN ( SELECT menu_id FROM blade_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+            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> )
-                    OR id IN (
+                    </foreach>
+                )
+                OR id IN (
                     select parent_id from blade_menu where is_deleted = 0
                     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> )
-                  )
-                ORDER BY
-                    sort
-            ) menu
+                )
+            )
+        ) menu
 
         UNION ALL
 
@@ -352,21 +354,25 @@
             id AS "value",
             id AS "key"
         FROM
-        blade_scope_data
+            blade_scope_data
         WHERE
             is_deleted = 0
-            AND menu_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> )
+        AND (
+            menu_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>
+            )
             OR menu_id IN (
-            select parent_id from blade_menu where is_deleted = 0
-            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 parent_id from blade_menu where is_deleted = 0
+                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> )
             )
-          AND menu_id IS NOT NULL
+        )
+        AND menu_id IS NOT NULL
     </select>
 
     <select id="grantApiScopeTreeByRole" resultMap="treeNodeResultMap">
@@ -374,55 +380,63 @@
         *
         FROM
         (
-        SELECT
-        id,
-        parent_id,
-        NAME AS title,
-        id AS "value",
-        id AS "key"
-        FROM
-        blade_menu
-        WHERE
-        category = 1
-        AND is_deleted = 0
-        AND id IN ( SELECT menu_id FROM blade_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
-        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> )
-        OR id IN (
-        select parent_id from blade_menu where is_deleted = 0
-        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> )
-        )
-        ORDER BY
-        sort
+            SELECT
+                id,
+                parent_id,
+                NAME AS title,
+                id AS "value",
+                id AS "key"
+            FROM
+                blade_menu
+            WHERE
+                category = 1
+            AND is_deleted = 0
+            AND id IN ( SELECT menu_id FROM blade_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
+            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>
+                )
+                OR id IN (
+                    select parent_id from blade_menu where is_deleted = 0
+                    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
 
         UNION ALL
 
         SELECT
-        id,
-        menu_id AS parent_id,
-        scope_name AS title,
-        id AS "value",
-        id AS "key"
+            id,
+            menu_id AS parent_id,
+            scope_name AS title,
+            id AS "value",
+            id AS "key"
         FROM
-        blade_scope_api
+            blade_scope_api
         WHERE
-        is_deleted = 0
-        AND menu_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> )
-        OR menu_id IN (
-        select parent_id from blade_menu where is_deleted = 0
-        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> )
+            is_deleted = 0
+        AND
+            (
+                menu_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>
+                )
+            OR menu_id IN (
+                    select parent_id from blade_menu where is_deleted = 0
+                    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> )
+                )
         )
         AND menu_id IS NOT NULL
     </select>