From 027bc4eedfd1ab89af658e025324523848085e7b Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sun, 16 Feb 2025 22:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=85=AC=E5=8F=B8id?=
 =?UTF-8?q?=20=E6=94=B9INT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/AdminBaseAreaService.java       |  2 ++
 .../mobilebroken/common/pojo/vo/TBaseAreaVO.java  | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

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<TBaseAreaVO> roots = new ArrayList<>();
+//        List<TBaseAreaVO> 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;
 
 /**
  * <p>
@@ -82,4 +83,18 @@ public class TBaseAreaVO implements Serializable {
      * 子级列表
      */
     private List<TBaseAreaVO> 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);
+    }
 }