From 42ae74b0e2e507476b45e89bbb3456cdec480dc5 Mon Sep 17 00:00:00 2001 From: zhansihu Date: Fri, 15 Sep 2023 14:23:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=9D=83=E9=99=90=E7=82=B9):=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0IDS?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B=20fix(=E6=9D=83=E9=99=90=E7=82=B9):?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3=E6=8E=92=E5=BA=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/permission/PermissionPointListQueryRequest.java | 5 +++++ .../tyr/server/service/impl/PermissionPointServiceImpl.java | 3 ++- .../cn/axzo/tyr/server/permission/PermissionPointTest.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) 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)); }