diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java index 6805d3bf..f015c74a 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBaseAreaService.java @@ -104,10 +104,12 @@ public class AdminBaseAreaService { .collect(Collectors.toMap(TBaseAreaVO::getId,area->area, (existing, replacement) -> existing)); List roots = new ArrayList<>(); +// List resultNodes= nodes.stream().sorted((n1, n2) -> Integer.compare(n2.getId(), n1.getId())).collect(Collectors.toList()); for (TBaseAreaVO node : nodes) { TBaseAreaVO parent = idToNodeMap.get(node.getParentAreaRowId()); if (parent != null) { + if(null==parent.getChildren()) { parent.setChildren(new ArrayList<>()); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java index 0df07afb..2c768bb9 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; +import java.util.Objects; /** *

@@ -82,4 +83,18 @@ public class TBaseAreaVO implements Serializable { * 子级列表 */ private List children; + + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + TBaseAreaVO that = (TBaseAreaVO) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } }