From 274d9de5e50cc2d23b25ba271a8e66021b448916 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 23 二月 2024 10:11:54 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java index 1c971a7..3b5aa86 100644 --- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java +++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; @Service public class SystemMenuBizImpl implements SystemMenuBiz { @@ -110,8 +111,12 @@ public List<SystemMenuListVO> findTreeByType(Integer type) { List<SystemMenuListVO> menus = systemMenuService.findList(type); List<SystemMenuListVO> rootMenus = new ArrayList<>(); + if(type.equals(Constants.ONE)){ + menus = menus.stream().filter(m->!m.getDisabled()).collect(Collectors.toList()); + } // 娣诲姞鏍硅彍鍗� for (SystemMenu menu : menus) { + if (menu.getParentId() == null) { SystemMenuListVO rootMenu = new SystemMenuListVO(); BeanUtils.copyProperties(menu, rootMenu, "children"); @@ -147,6 +152,7 @@ SystemMenu systemMenu = new SystemMenu(); systemMenu.setType(type); systemMenu.setDeleted(Boolean.FALSE); + systemMenu.setDisabled(Boolean.FALSE); menus = systemMenuService.findList(systemMenu); } } -- Gitblit v1.9.3