fix(基础功能): 解决根节点id可能为空的问题 (#224)

hs-web · Aug 17, 2023 · ce655e7 · ce655e7
1 parent e918889
commit ce655e7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...b-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/TreeSupportEntity.java b/...b-commons-api/src/main/java/org/hswebframework/web/api/crud/entity/TreeSupportEntity.java
@@ -184,18 +184,18 @@ static <T extends TreeSupportEntity<PK>, PK> void expandTree2List(T root, List<T
             }
         }
 
-        if (CollectionUtils.isEmpty(root.getChildren())) {
-            target.add(root);
-            return;
-        }
-
         //尝试设置id
         PK parentId = root.getId();
         if (parentId == null) {
             parentId = idGenerator.generate();
             root.setId(parentId);
         }
 
+        if (CollectionUtils.isEmpty(root.getChildren())) {
+            target.add(root);
+            return;
+        }
+
         //所有节点处理队列
         Queue<T> queue = new LinkedList<>();
         queue.add(root);