From 4e4b8d50119113512cd4a892bbb110941ead4793 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Thu, 1 Aug 2019 23:16:33 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E8=B6=85=E7=AE=A1=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=8B=A5=E6=9C=89=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/system/mapper/MenuMapper.java |  8 ++++
 .../springblade/system/mapper/MenuMapper.xml  | 42 +++++++++++++++++++
 .../system/service/impl/MenuServiceImpl.java  |  7 +---
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
index 7fc89e2e..b5963c7c 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
@@ -132,6 +132,13 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 */
 	List<Menu> routes(List<Long> roleId);
 
+	/**
+	 * 按钮树形结构
+	 *
+	 * @return
+	 */
+	List<Menu> allButtons();
+
 	/**
 	 * 按钮树形结构
 	 *
@@ -142,6 +149,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
 
 	/**
 	 * 获取配置的角色权限
+	 *
 	 * @param roleIds
 	 * @return
 	 */
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 bd9eaacf..1af97b62 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
@@ -66,6 +66,48 @@
                         </foreach> )
     </select>
 
+    <select id="allButtons" resultMap="menuResultMap">
+        SELECT
+            *
+        FROM
+            (
+                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
+    </select>
+
     <select id="buttons" resultMap="menuResultMap">
         SELECT * FROM (
             SELECT
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
index 2c8f3b1c..d930e7f5 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
@@ -24,7 +24,6 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
@@ -72,10 +71,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
-		String userRole = SecureUtil.getUserRole();
-		boolean isAdministrator = StringUtil.containsAny(userRole, RoleConstant.ADMINISTRATOR);
 		List<Menu> allMenus = baseMapper.allMenu();
-		List<Menu> roleMenus = baseMapper.roleMenu(Func.toLongList(roleId), topMenuId);
+		List<Menu> roleMenus = (SecureUtil.isAdministrator()) ? allMenus : baseMapper.roleMenu(Func.toLongList(roleId), topMenuId);
 		return buildRoutes(allMenus, roleMenus);
 	}
 
@@ -98,7 +95,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 
 	@Override
 	public List<MenuVO> buttons(String roleId) {
-		List<Menu> buttons = baseMapper.buttons(Func.toLongList(roleId));
+		List<Menu> buttons = (SecureUtil.isAdministrator()) ? baseMapper.allButtons() : baseMapper.buttons(Func.toLongList(roleId));
 		MenuWrapper menuWrapper = new MenuWrapper();
 		return menuWrapper.listNodeVO(buttons);
 	}