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 |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 f969784..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
@@ -115,6 +115,32 @@
     }
 
     @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
     public List<ManageMenu> getManageMenuByNameFuzzy(Map map) {
         Map limitMap = new HashMap();
         limitMap.put("name", map.get("name"));

--
Gitblit v1.8.0