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 31c3c2b..0d5deb7 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzTreatmentBasisController.java @@ -15,10 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -127,7 +124,14 @@ public class SzTreatmentBasisController{ .filter(o -> 0L == o.getPId()) .collect(Collectors.toList()); - + Iterator iterator = parentList.iterator(); + while (iterator.hasNext()){ + SzTreatmentBasis node = iterator.next(); + Long id = node.getId(); + if (!listMap.containsKey(id) && Integer.valueOf(0).equals(node.getDisplay())) { + iterator.remove(); + } + } return R.ok(parentList); }