From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index 7d18186..35b3607 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -111,8 +111,33 @@
limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
limitMap.put("number", Integer.parseInt(map.get("size").toString()));
List<ManageMenu> manageMenus = manageMenuMapper.getDataWithPage(limitMap);
- System.out.println(manageMenus);
return manageMenus;
+ }
+
+ @Override
+ public List<ManageMenu> getAllMenus() {
+ List<ManageMenu> allMenus = manageMenuMapper.getAll();
+ if(ObjectUtils.isEmpty(allMenus))
+ return null;
+ Map<Integer, ManageMenu> menusMap = new HashMap<>();
+ for (ManageMenu menu : allMenus) {
+ menu.setChildren(new ArrayList<>());//���������
+ menusMap.put(menu.getId(), menu);
+ }
+ for (ManageMenu menu : allMenus) {
+ combinationParentChildrenMenus(menusMap, menu);
+ }
+
+ //������������������������������������parentId������0������������������������
+ allMenus.removeIf(new Predicate<ManageMenu>() {
+ @Override
+ public boolean test(ManageMenu manageMenu) {
+ if(manageMenu.getParentId().equals(0))
+ return false;
+ return true;
+ }
+ });
+ return allMenus;
}
@Override
@@ -128,6 +153,8 @@
@Override
public List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles) {
List<ManageMenu> allMenus = manageMenuMapper.getAllMenusByRoles(roles);
+ if(ObjectUtils.isEmpty(allMenus))
+ return null;
Map<Integer, ManageMenu> menusMap = new HashMap<>();
for (ManageMenu menu : allMenus) {
menu.setChildren(new ArrayList<>());//���������
@@ -136,6 +163,7 @@
for (ManageMenu menu : allMenus) {
combinationParentChildrenMenus(menusMap, menu);
}
+
//������������������������������������parentId������0������������������������
allMenus.removeIf(new Predicate<ManageMenu>() {
@Override
--
Gitblit v1.8.0