From 54d7eb96e071c62fa96f95b56ff8be66f7c3718e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:25 +0800
Subject: [PATCH] screen-manage 修改日志插入工具类 规范日志插入格式
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 4 +++-
1 files changed, 3 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..f969784 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,7 +111,6 @@
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;
}
@@ -128,6 +127,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 +137,7 @@
for (ManageMenu menu : allMenus) {
combinationParentChildrenMenus(menusMap, menu);
}
+
//������������������������������������parentId������0������������������������
allMenus.removeIf(new Predicate<ManageMenu>() {
@Override
--
Gitblit v1.8.0