From 19f16a5d7ffe8c3a71f7df76a3d39964454b7d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Thu, 19 Dec 2024 16:17:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3282)=20=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=EF=BC=8C=E6=94=AF=E6=8C=81=E6=96=B0?= =?UTF-8?q?=E6=97=A7featureCode=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tyr/server/service/impl/PermissionServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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()) {