From ebd2b29f70ad8a38bfbda54d01cf0bc8d4195908 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 11 Apr 2025 09:17:24 +0800 Subject: [PATCH] . --- .../xyt/controller/SzTreatmentBasisController.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java index af6e2d8..d8363c7 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java @@ -125,7 +125,7 @@ public class SzTreatmentBasisController{ .collect(Collectors.toList()); parentList.forEach(this::trim); - parentList.removeIf(node -> CollectionUtils.isEmpty(node.getChildren())); + parentList.removeIf(node -> CollectionUtils.isEmpty(node.getChildren()) && (Integer.valueOf(0).equals(node.getDisplay()) || node.getDisplay() == null)); return R.ok(parentList); } @@ -135,19 +135,11 @@ public class SzTreatmentBasisController{ boolean isMiddleNode = false; if (CollectionUtils.isNotEmpty(children)) { isMiddleNode = true; - Iterator iterator = children.iterator(); -// while (iterator.hasNext()) { -// SzTreatmentBasis child = iterator.next(); -// boolean f = trim(child); -// if (f) { -// iterator.remove(); -// } -// } children.removeIf(this::trim); } //没有子节点的节点，且display是0，是末端节点；没有子节点的节点，且曾经有过子节点，是中间节点 //末端节点的display是0就删，中间节点没有子节点就删 - return CollectionUtils.isEmpty(children) && (Integer.valueOf(0).equals(node.getDisplay()) || isMiddleNode); + return CollectionUtils.isEmpty(children) && (isMiddleNode || Integer.valueOf(0).equals(node.getDisplay())); } @Operation(summary = "删除")