diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionServiceImpl.java index 3e1cc496..6ea2b27a 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionServiceImpl.java @@ -10,6 +10,7 @@ import cn.axzo.tyr.server.service.ProductPermissionCacheService; import cn.axzo.tyr.server.service.RolePermissionCacheService; import cn.axzo.tyr.server.service.SaasFeatureResourceService; import cn.axzo.tyr.server.service.WorkspaceProductService; +import cn.axzo.tyr.server.util.FeatureCodeUtil; import cn.hutool.core.collection.CollectionUtil; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; @@ -37,6 +38,8 @@ public class PermissionServiceImpl implements PermissionService { private WorkspaceProductService workspaceProductService; @Autowired private SaasFeatureResourceService saasFeatureResourceService; + @Autowired + private FeatureCodeUtil featureCodeUtil; /** * 1、查询用户的角色 @@ -57,6 +60,10 @@ public class PermissionServiceImpl implements PermissionService { return Collections.emptyList(); } + // 为了兼容新旧featureCode,这里根据featureCode去查询新旧featureCode的映射把新旧featureCode都组装起 + Set newFeatureCodes = featureCodeUtil.resolveFeatureCode(param.getFeatureCodes()); + param.setFeatureCodes(newFeatureCodes); + // 查询项目的权限 Map> workspacePermissionMap = listWorkspacePermission(param); if (Objects.isNull(workspacePermissionMap) || workspacePermissionMap.isEmpty()) {