From 341e04faed768a5f7382f2cdd9a3e94d8d0a7a70 Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 20 Aug 2024 11:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/controller/SysDictBController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java index 5055758..41cd68e 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java @@ -48,7 +48,7 @@ public class SysDictBController { throw new IllegalArgumentException("当前名称已存在"); } } - if (Objects.nonNull(dto.getPid())){ + if (Objects.nonNull(dto.getPid()) && !"0".equals(dto.getPid()) ){ if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid()) .count() == 0) { throw new IllegalArgumentException("当父级不存在"); @@ -70,11 +70,12 @@ public class SysDictBController { if (StringUtils.isNotBlank(dto.getDictNm())){ if (service.lambdaQuery().eq(SysDictB::getDictNm,dto.getDictNm()) + .ne(SysDictB::getId,dto.getId()) .count() > 0) { throw new IllegalArgumentException("当前名称已存在"); } } - if (Objects.nonNull(dto.getPid())){ + if (Objects.nonNull(dto.getPid()) && !"0".equals(dto.getPid()) ){ if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid()) .count() == 0) { throw new IllegalArgumentException("当父级不存在"); @@ -112,6 +113,9 @@ public class SysDictBController { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); Page data = service.page(page.getPageSo().toPage(), queryWrapper.eq(SysDictB::getPid,0L)); + + data.getRecords().forEach( o-> o.setChildren(service.lambdaQuery().eq(SysDictB::getPid,o.getId()).list())); + return R.ok(data); }