diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointListQueryRequest.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointListQueryRequest.java index 82c03cb0..08098cab 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointListQueryRequest.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointListQueryRequest.java @@ -2,6 +2,8 @@ package cn.axzo.tyr.client.model.permission; import lombok.Data; +import java.util.List; + /** * 权限点列表查询对象 * 按需扩展 @@ -38,5 +40,8 @@ public class PermissionPointListQueryRequest { * path左匹配 * **/ private String likePath; + + /** 权限点ID列表 **/ + private List ids; } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java index ab018c3f..15f383bc 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java @@ -358,6 +358,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { .eq(Objects.nonNull(request.getFeatureType()), SaasFeature::getFeatureType, request.getFeatureType()) .eq(Objects.nonNull(request.getParentId()), SaasFeature::getParentId, request.getParentId()) .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()); return this.saasFeatureDao.list(wrapper) @@ -391,7 +392,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { //找到需要更新排序的节点 for (int i = 0; i < sortedList.size(); 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); } } diff --git a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java index 813063bc..1fd25e78 100644 --- a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java +++ b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java @@ -126,6 +126,7 @@ public class PermissionPointTest { public void testQueryList() { PermissionPointListQueryRequest request = new PermissionPointListQueryRequest(); request.setFeatureType(FeatureType.BUTTON.getCode()); + request.setIds(Arrays.asList(255L, 266L)); ApiResult> result = controller.queryList(request); System.out.println(JSON.toJSONString(result)); }