From 59bbada0129e17dd5c5a180f43a6d6e4ac16ec5c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 7 Nov 2022 11:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E6=A0=87=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HomeFunctionModuleEOServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 ea18ace2b..e5a01ff5e 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 @@ -144,6 +144,19 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl homeFunctionModuleEOSTemp = new ArrayList<>(); + //第一次配置后, 重新添加权限的图标 + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { + List collect = metaList.stream().filter(e -> homeFunctionModuleEO.getIconName().equals(e.getName())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + List iconNameList = homeFunctionModuleEOS.stream().map(HomeFunctionModuleEO::getIconName).collect(Collectors.toList()); + //有权限但是配有配置的图标 + if(!iconNameList.contains(homeFunctionModuleEO.getIconName())){ + homeFunctionModuleEOSTemp.add(homeFunctionModuleEO); + } + } + } + + //有权限且第一次配置的图标(每个用户会将配置的和没有配置的数据存一套) for (SysPermission sysPermission : metaList) { List collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(collect)){