From f494adc3cf778111a899c8ba9de2a75ccf37faf1 Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Mon, 13 Jan 2025 21:42:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(menu):=20=E4=BC=98=E5=8C=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=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

- 移除了 MenuController 中未使用的 import 语句- 更新了 MenuMapper.xml 中的 SQL 查询，去除了不必要的连接- 重构了 MenuServiceImpl 中的 getTree 方法，增加了对管理员用户的特殊处理
- 新增了 createTree 方法，用于创建菜单树结构
---
 .../gateway/modules/system/controller/MenuController.java | 2 --
 .../modules/system/service/impl/MenuServiceImpl.java      | 8 +++++++-
 src/main/resources/mappers/system/MenuMapper.xml          | 3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/controller/MenuController.java b/src/main/java/com/zsc/edu/gateway/modules/system/controller/MenuController.java
index b50f201..366e948 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/system/controller/MenuController.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/system/controller/MenuController.java
@@ -4,13 +4,11 @@ import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import com.zsc.edu.gateway.modules.system.dto.MenuDto;
 import com.zsc.edu.gateway.modules.system.entity.Menu;
 import com.zsc.edu.gateway.modules.system.service.MenuService;
-import com.zsc.edu.gateway.modules.system.utils.TreeUtil;
 import com.zsc.edu.gateway.modules.system.vo.MenuVo;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.awt.*;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImpl.java
index 77fa3f8..b328f50 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/MenuServiceImpl.java
@@ -74,8 +74,15 @@ public class MenuServiceImpl extends ServiceImpl<MenuRepository, Menu> implement
 
     @Override
     public List<MenuVo> getTree(UserDetailsImpl userDetails, String name) {
+        if (Objects.equals(userDetails.getUsername(), "admin")) {
+            List<MenuVo> menus = baseMapper.selectAll().stream().map(MenuVo::new).toList();
+            return createTree(menus, name);
+        }
         List<MenuVo> menuVos = selectByUserId(userDetails.getId(), Menu.Type.PAGE).stream().map(MenuVo::new).toList();
+        return createTree(menuVos, name);
+    }
 
+    public List<MenuVo> createTree(List<MenuVo> menuVos, String name) {
         List<MenuVo> menuTrees = TreeUtil.makeTree(
                 menuVos,
                 menuVo -> menuVo.getPid() == null || menuVo.getPid() == -1L,
@@ -101,5 +108,4 @@ public class MenuServiceImpl extends ServiceImpl<MenuRepository, Menu> implement
         return menuTrees;
     }
 
-
 }
diff --git a/src/main/resources/mappers/system/MenuMapper.xml b/src/main/resources/mappers/system/MenuMapper.xml
index b914a39..8bc66b1 100644
--- a/src/main/resources/mappers/system/MenuMapper.xml
+++ b/src/main/resources/mappers/system/MenuMapper.xml
@@ -12,8 +12,5 @@
     <select id="selectAll" resultType="com.zsc.edu.gateway.modules.system.entity.Menu">
         select m.*
         from sys_menu m
-                 left join sys_role_menu rm on rm.menu_id = m.id
-                 left join sys_role r on r.id = rm.role_id
-                 left join sys_user u on u.role_id = r.id
     </select>
 </mapper>