换一种循环

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java

@@ -155,14 +155,16 @@ public class AppMenuServiceImpl extends BaseServiceImpl<AppMenuDao, AppMenuEntit
         List<AppMenuDTO> dtoList = ConvertUtils.sourceToTarget(getUserMenuList(userDetail), AppMenuDTO.class);
         List<AppMenuDTO> workMenuList = Lists.newArrayList();
         List<AppMenuDTO> analysisMenuList = Lists.newArrayList();
-        for (int i = 0; i < dtoList.size(); i++) {
+        dtoList.forEach(dto -> {
-            AppMenuDTO dto = dtoList.get(i);
+            if (dto != null) {
-            if (AppMenuCategoryEnum.WORK.getValue().equals(dto.getCategory())) {
+                String category = dto.getCategory();
-                workMenuList.add(dto);
+                if (AppMenuCategoryEnum.WORK.getValue().equals(category)) {
-            } else if (AppMenuCategoryEnum.ANALYSIS.getValue().equals(dto.getCategory())) {
+                    workMenuList.add(dto);
-                analysisMenuList.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));