From 199971c2c2f20e22fdfb088b11caeaee1e523c2f Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Tue, 13 Apr 2021 14:26:11 +0800 Subject: [PATCH] 添加角色新增日志 --- screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 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 75a4dfb..3b0d4bf 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,59 @@ } @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> getManageMenuByRoleId(int roleId) { + List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByRoleId(roleId); + System.out.println(manageMenus); + if(ObjectUtils.isEmpty(manageMenus)) + return null; + Map<Integer, ManageMenu> menusMap = new HashMap<>(); + for (ManageMenu menu : manageMenus) { + menu.setChildren(new ArrayList<>());//��������� + menusMap.put(menu.getId(), menu); + } + for (ManageMenu menu : manageMenus) { + combinationParentChildrenMenus(menusMap, menu); + } + + //������������������������������������parentId������0������������������������ + manageMenus.removeIf(new Predicate<ManageMenu>() { + @Override + public boolean test(ManageMenu manageMenu) { + if(manageMenu.getParentId().equals(0)) + return false; + return true; + } + }); + return manageMenus; + } + + @Override public List<ManageMenu> getManageMenuByNameFuzzy(Map map) { Map limitMap = new HashMap(); limitMap.put("name", map.get("name")); @@ -127,6 +180,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<>());//��������� @@ -135,6 +190,7 @@ for (ManageMenu menu : allMenus) { combinationParentChildrenMenus(menusMap, menu); } + //������������������������������������parentId������0������������������������ allMenus.removeIf(new Predicate<ManageMenu>() { @Override -- Gitblit v1.8.0