From 72c19d0d859af24a690766d6e7b99d98424c3e80 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 4 Nov 2022 15:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HomeFunctionModuleEOServiceImpl.java      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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<HomeFunctionMod
 		//用户拥有权限的菜单
 		List<SysPermission> metaList = sysPermissionService.queryByUser(loginUser.getUsername());
 
+		metaList = metaList.stream().filter(e->!"2".equals(String.valueOf(e.getMenuType()))).collect(Collectors.toList());
 		//所有的图表(state=0)
 		LambdaQueryWrapper<HomeFunctionModuleEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy);
@@ -142,13 +143,20 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
 			}
 			return homeFunctionModuleEOListTemp;
 		}else{
+			List<HomeFunctionModuleEO> homeFunctionModuleEOSTemp = new ArrayList<>();
+			for (SysPermission sysPermission : metaList) {
+				List<HomeFunctionModuleEO> 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;
 		}
-
     }
 }