From 3bdb6a5a951e033a315fb388565d5ba191609c74 Mon Sep 17 00:00:00 2001 From: stylefeng Date: Wed, 5 Feb 2025 15:04:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=91=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=BF=BD=E7=95=A5=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=86=E7=B1=BBid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/role/pojo/request/RoleCategoryRequest.java | 6 ++++++ .../modular/role/service/impl/RoleCategoryServiceImpl.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java index edd6e915e..b0c251755 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java @@ -59,4 +59,10 @@ public class RoleCategoryRequest extends BaseRequest { @ChineseDescription("角色分类排序") private BigDecimal fldSort; + /** + * 用在树查询上，用来作为忽略当条记录的传参 + */ + @ChineseDescription("用在树查询上，用来作为忽略当条记录的传参") + private Long ignoreCategoryId; + } \ No newline at end of file diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java index 2d3fa3139..097cc885b 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java @@ -39,6 +39,12 @@ public class RoleCategoryServiceImpl extends ServiceImpl treeList(RoleCategoryRequest roleCategoryRequest) { LambdaQueryWrapper wrapper = this.createWrapper(roleCategoryRequest); + + // 设置忽略查询的当条记录id + if (roleCategoryRequest.getIgnoreCategoryId() != null) { + wrapper.ne(RoleCategory::getId, roleCategoryRequest.getIgnoreCategoryId()); + } + List list = this.list(wrapper); if (ObjectUtil.isEmpty(list)) { return new ArrayList<>();