From 76e2ce4f9b3d4c85ae623973d4e7c2758ceeae7c Mon Sep 17 00:00:00 2001 From: yujt Date: Thu, 3 Sep 2020 15:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E4=B8=80=E7=A7=8D=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/AppMenuServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java index 1f2d725..329ed79 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java @@ -155,14 +155,16 @@ public class AppMenuServiceImpl extends BaseServiceImpl dtoList = ConvertUtils.sourceToTarget(getUserMenuList(userDetail), AppMenuDTO.class); List workMenuList = Lists.newArrayList(); List analysisMenuList = Lists.newArrayList(); - for (int i = 0; i < dtoList.size(); i++) { - AppMenuDTO dto = dtoList.get(i); - if (AppMenuCategoryEnum.WORK.getValue().equals(dto.getCategory())) { - workMenuList.add(dto); - } else if (AppMenuCategoryEnum.ANALYSIS.getValue().equals(dto.getCategory())) { - analysisMenuList.add(dto); + dtoList.forEach(dto -> { + if (dto != null) { + String category = dto.getCategory(); + if (AppMenuCategoryEnum.WORK.getValue().equals(category)) { + workMenuList.add(dto); + } else if (AppMenuCategoryEnum.ANALYSIS.getValue().equals(category)) { + analysisMenuList.add(dto); + } } - } + }); AppMenuGroupDTO group = new AppMenuGroupDTO(); group.setWorkMenu(TreeUtils.build(workMenuList)); group.setAnalysisMenu(TreeUtils.build(analysisMenuList));