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

feat(2227-permissionQuery):修复权限查询

Browse Source
This commit is contained in:
zhansihu 2024-04-15 22:55:14 +08:00
parent 10b79d1e33
commit 3940b0c394
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-server/src/main/java/cn/axzo/tyr/server/model/ResourcePermissionQueryDTO.java
View File

@ -28,7 +28,7 @@ public class ResourcePermissionQueryDTO {
private List<String> terminals; private List<String> terminals;
private List<Integer> authType; private List<Integer> authTypes;
/** 路径包含 **/ /** 路径包含 **/
private Long inPath; private Long inPath;

3
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
View File

@ -104,6 +104,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
.in(CollectionUtil.isNotEmpty(param.getFeatureTypes()), SaasFeatureResource::getFeatureType, param.getFeatureTypes()) .in(CollectionUtil.isNotEmpty(param.getFeatureTypes()), SaasFeatureResource::getFeatureType, param.getFeatureTypes())
.in(CollectionUtil.isNotEmpty(param.getFeatureCodes()), SaasFeatureResource::getFeatureCode, param.getFeatureCodes()) .in(CollectionUtil.isNotEmpty(param.getFeatureCodes()), SaasFeatureResource::getFeatureCode, param.getFeatureCodes())
.in(CollectionUtil.isNotEmpty(param.getTerminals()), SaasFeatureResource::getTerminal, param.getTerminals()) .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)") .apply(Objects.nonNull(param.getInPath()), " FIND_IN_SET(" + param.getInPath() + ", path)")
.list(); .list();
return BeanMapper.copyList(resourceList, ResourcePermission.class); return BeanMapper.copyList(resourceList, ResourcePermission.class);
@ -118,7 +119,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
//load from DB //load from DB
String[] featureIds = this.permissionQuery(ResourcePermissionQueryDTO.builder() String[] featureIds = this.permissionQuery(ResourcePermissionQueryDTO.builder()
.authType(Collections.singletonList(FeatureResourceAuthType.ALL_ROLE.getCode())) .authTypes(Collections.singletonList(FeatureResourceAuthType.ALL_ROLE.getCode()))
.build()) .build())
.stream() .stream()
.map(ResourcePermission::getId).map(String::valueOf) .map(ResourcePermission::getId).map(String::valueOf)