From 8fd710198bb03e6ad6a04d325398d754b9bd1520 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 12 Aug 2024 19:01:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E4=B9=A6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/laws/standard/service/DictTreeService.java | 3 ++- .../laws/standard/service/impl/PartNameServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java index 7d99e613..5a9faf76 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/DictTreeService.java @@ -123,7 +123,8 @@ public class DictTreeService { Set rootNodeIds = rootNodes.stream().map(SysDictItem::getId).collect(Collectors.toSet()); rootNodes.forEach(node -> { node.setLeafFlag(matchedNodes.stream() - .noneMatch(n -> rootNodeIds.contains(n.getParentId()))); + .noneMatch(n -> (rootNodeIds.contains(n.getParentId()) && + n.getParentId().equals(node.getId())))); }); return new ArrayList<>(rootNodes); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java index d12c4c97..3cc2fd67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java @@ -288,7 +288,8 @@ public class PartNameServiceImpl extends ServiceImpl Set rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet()); rootNodes.forEach(node -> { node.setLeafFlag(matchedNodes.stream() - .noneMatch(n -> rootNodeCodes.contains(n.getParentCode()))); + .noneMatch(n -> (rootNodeCodes.contains(n.getParentCode()) && + n.getParentCode().equals(node.getCode())))); }); return new ArrayList<>(rootNodes);