wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(hotfix/20240906) 修改菜单缓存逻辑

Browse Source
This commit is contained in:
lilong 2024-09-11 18:31:07 +08:00
parent 602ac65618
commit b16da5cd22
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
View File

@ -1011,7 +1011,7 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
.collect(Collectors.toList()))
.orElseGet(Lists::newArrayList);
Set<Long> normalFeatureIds = resolveNormalRole(productFeatureSources, saasRole, roleFeatureResources, roleFeatureResourceMap);
Set<Long> normalFeatureIds = resolveNormalRole(productFeatureSources, saasRole, roleFeatureResources);
Set<Long> result = Sets.newHashSet();
result.addAll(adminFeatureIds);
@ -1042,12 +1042,7 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
private Set<Long> resolveNormalRole(List<ProductSaasFeatureResourceCacheService.FeatureResourceDTO> workspaceProduct,
SaasRoleUserV2DTO.SaasRole saasRole,
List<RoleSaasFeatureResourceCacheService.SaasFeatureResourceDTO> roleFeatureResources,
Map<Long, List<RoleSaasFeatureResourceCacheService.SaasFeatureResourceDTO>> roleFeatureResourceMap) {
if (RoleTypeEnum.isAdmin(saasRole.getRoleType())) {
return Collections.emptySet();
}
List<RoleSaasFeatureResourceCacheService.SaasFeatureResourceDTO> roleFeatureResources) {
if (CollectionUtils.isEmpty(roleFeatureResources)) {
return Collections.emptySet();