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 implement @Override public List getTree(UserDetailsImpl userDetails, String name) { + if (Objects.equals(userDetails.getUsername(), "admin")) { + List menus = baseMapper.selectAll().stream().map(MenuVo::new).toList(); + return createTree(menus, name); + } List menuVos = selectByUserId(userDetails.getId(), Menu.Type.PAGE).stream().map(MenuVo::new).toList(); + return createTree(menuVos, name); + } + public List createTree(List menuVos, String name) { List menuTrees = TreeUtil.makeTree( menuVos, menuVo -> menuVo.getPid() == null || menuVo.getPid() == -1L, @@ -101,5 +108,4 @@ public class MenuServiceImpl extends ServiceImpl 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 @@