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

refactor(权限点): 列表查询增加IDS条件；

Browse Source 
fix(权限点): 修正排序bug
This commit is contained in:
zhansihu 2023-09-15 14:23:46 +08:00
parent 76392a072b
commit 42ae74b0e2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointListQueryRequest.java
View File

@ -2,6 +2,8 @@ package cn.axzo.tyr.client.model.permission;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* 权限点列表查询对象 * 权限点列表查询对象
* 按需扩展 * 按需扩展
@ -38,5 +40,8 @@ public class PermissionPointListQueryRequest {
* path左匹配 * path左匹配
* **/ * **/
private String likePath; private String likePath;
/** 权限点ID列表 **/
private List<Long> ids;
} }

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

@ -358,6 +358,7 @@ public class PermissionPointServiceImpl implements PermissionPointService {
.eq(Objects.nonNull(request.getFeatureType()), SaasFeature::getFeatureType, request.getFeatureType()) .eq(Objects.nonNull(request.getFeatureType()), SaasFeature::getFeatureType, request.getFeatureType())
.eq(Objects.nonNull(request.getParentId()), SaasFeature::getParentId, request.getParentId()) .eq(Objects.nonNull(request.getParentId()), SaasFeature::getParentId, request.getParentId())
.eq(Objects.nonNull(request.getDelegatedType()), SaasFeature::getDelegatedType, request.getDelegatedType()) .eq(Objects.nonNull(request.getDelegatedType()), SaasFeature::getDelegatedType, request.getDelegatedType())
.in(CollectionUtil.isNotEmpty(request.getIds()), SaasFeature::getId, request.getIds())
.likeRight(Objects.nonNull(request.getLikePath()), SaasFeature::getPath, request.getLikePath()); .likeRight(Objects.nonNull(request.getLikePath()), SaasFeature::getPath, request.getLikePath());
return this.saasFeatureDao.list(wrapper) return this.saasFeatureDao.list(wrapper)
@ -391,7 +392,7 @@ public class PermissionPointServiceImpl implements PermissionPointService {
//找到需要更新排序的节点 //找到需要更新排序的节点
for (int i = 0; i < sortedList.size(); i++) { for (int i = 0; i < sortedList.size(); i++) {
SaasFeature saasFeature = sortedList.get(i); SaasFeature saasFeature = sortedList.get(i);
if (Objects.equals(saasFeature.getSort(), i + 1)) { if (!Objects.equals(saasFeature.getSort(), i + 1)) {
sortMap.put(saasFeature.getId(), i + 1); sortMap.put(saasFeature.getId(), i + 1);
} }
} }

1
tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java
View File

@ -126,6 +126,7 @@ public class PermissionPointTest {
public void testQueryList() { public void testQueryList() {
PermissionPointListQueryRequest request = new PermissionPointListQueryRequest(); PermissionPointListQueryRequest request = new PermissionPointListQueryRequest();
request.setFeatureType(FeatureType.BUTTON.getCode()); request.setFeatureType(FeatureType.BUTTON.getCode());
request.setIds(Arrays.asList(255L, 266L));
ApiResult<List<PermissionPointTreeNode>> result = controller.queryList(request); ApiResult<List<PermissionPointTreeNode>> result = controller.queryList(request);
System.out.println(JSON.toJSONString(result)); System.out.println(JSON.toJSONString(result));
} }