From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..0089867 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");
@@ -133,7 +138,7 @@
List<SystemMenu> menus = new ArrayList<SystemMenu>();
List<SystemMenuNodeVO> rootNodes = new ArrayList<>();
menus = systemMenuService.findByUserId(userId,type);
- if(type.equals(Constants.ONE)){
+ if(type.equals(Constants.ONE) || type.equals(Constants.TWO)){
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Company company = companyService.findById(loginUserInfo.getCompanyId());
if(Objects.isNull(company)){
@@ -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