diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index 5b74357c8..ea18ace2b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -115,6 +115,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl metaList = sysPermissionService.queryByUser(loginUser.getUsername()); + metaList = metaList.stream().filter(e->!"2".equals(String.valueOf(e.getMenuType()))).collect(Collectors.toList()); //所有的图表(state=0) LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy); @@ -142,13 +143,20 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl homeFunctionModuleEOSTemp = new ArrayList<>(); + for (SysPermission sysPermission : metaList) { + List collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + homeFunctionModuleEOSTemp.addAll(collect); + } + } + homeFunctionModuleEOSTemp = homeFunctionModuleEOSTemp.stream().distinct().collect(Collectors.toList()); if(CutEnum.EN.getValue().equals(cut)){ - for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) { + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOSTemp) { homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); } } - return homeFunctionModuleEOS; + return homeFunctionModuleEOSTemp; } - } }