WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

Browse Source
This commit is contained in:
CD
2022-11-07 11:56:18 +08:00
parent 7afa1f6faf 59bbada012
commit e39cfd8d25
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+13
View File
@@ -144,6 +144,19 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
return homeFunctionModuleEOListTemp; return homeFunctionModuleEOListTemp;
}else{ }else{
List<HomeFunctionModuleEO> homeFunctionModuleEOSTemp = new ArrayList<>(); List<HomeFunctionModuleEO> homeFunctionModuleEOSTemp = new ArrayList<>();
//第一次配置后, 重新添加权限的图标
for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) {
List<SysPermission> collect = metaList.stream().filter(e -> homeFunctionModuleEO.getIconName().equals(e.getName())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect)){
List<String> iconNameList = homeFunctionModuleEOS.stream().map(HomeFunctionModuleEO::getIconName).collect(Collectors.toList());
//有权限但是配有配置的图标
if(!iconNameList.contains(homeFunctionModuleEO.getIconName())){
homeFunctionModuleEOSTemp.add(homeFunctionModuleEO);
}
}
}
//有权限且第一次配置的图标(每个用户会将配置的和没有配置的数据存一套)
for (SysPermission sysPermission : metaList) { for (SysPermission sysPermission : metaList) {
List<HomeFunctionModuleEO> collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList()); List<HomeFunctionModuleEO> collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect)){ if(ObjectUtils.isNotEmpty(collect)){