From 3940b0c39454cf4e1092962cbf9701e6ca1f1a8a Mon Sep 17 00:00:00 2001 From: zhansihu Date: Mon, 15 Apr 2024 22:55:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(2227-permissionQuery):=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java | 2 +- .../server/service/impl/SaasFeatureResourceServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java b/tyr-server/src/main/java/cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java index b3818ac9..e3857d2e 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java @@ -28,7 +28,7 @@ public class ResourcePermissionQueryDTO { private List terminals; - private List authType; + private List authTypes; /** 路径包含 **/ private Long inPath; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index ac777628..0dc69631 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -104,6 +104,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic .in(CollectionUtil.isNotEmpty(param.getFeatureTypes()), SaasFeatureResource::getFeatureType, param.getFeatureTypes()) .in(CollectionUtil.isNotEmpty(param.getFeatureCodes()), SaasFeatureResource::getFeatureCode, param.getFeatureCodes()) .in(CollectionUtil.isNotEmpty(param.getTerminals()), SaasFeatureResource::getTerminal, param.getTerminals()) + .in(CollectionUtil.isNotEmpty(param.getAuthTypes()), SaasFeatureResource::getAuthType, param.getAuthTypes()) .apply(Objects.nonNull(param.getInPath()), " FIND_IN_SET(" + param.getInPath() + ", path)") .list(); return BeanMapper.copyList(resourceList, ResourcePermission.class); @@ -118,7 +119,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic //load from DB String[] featureIds = this.permissionQuery(ResourcePermissionQueryDTO.builder() - .authType(Collections.singletonList(FeatureResourceAuthType.ALL_ROLE.getCode())) + .authTypes(Collections.singletonList(FeatureResourceAuthType.ALL_ROLE.getCode())) .build()) .stream() .map(ResourcePermission::getId).map(String::valueOf)