From f7159831fe349f82224f2fba866255d34a601472 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 26 Feb 2024 15:41:34 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/standard/controller/LawsPartNameController.java  | 6 ++++++
 .../laws/standard/service/impl/PartNameServiceImpl.java   | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java
index 57436e65..55d7df66 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsPartNameController.java
@@ -38,6 +38,12 @@ public class LawsPartNameController {
             @RequestParam(name = "nodeName", required = false, defaultValue = "") @ApiParam("一级节点名称") String nodeName,
             @RequestParam(name = "pageNo", defaultValue = "1") @ApiParam("页码") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") @ApiParam("页面大小") Integer pageSize) {
+        if (pageNo == null) {
+            pageNo = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 5;
+        }
         TreePage<PartName> list = partNameService.queryTreeList(nodeName, pageNo, pageSize);
         return Result.OK(list);
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
index 3ac0c7dd..547794c0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
@@ -48,7 +48,7 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
         // 不做筛选的时候查询加速
         if (StrUtil.isBlank(nodeName)) {
             // 构建树结构
-            topLevelNodes = this.buildTree(new HashSet<>(allNodes));
+            topLevelNodes = this.buildTree(allNodes);
         } else {
             // 做筛选的时候需要自己组树
             queryWrapper.clear();
@@ -85,11 +85,11 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
         return result;
     }
 
-    private List<PartName> buildTree(Set<PartName> nodesSet) {
+    private List<PartName> buildTree(Collection<PartName> nodesCollection) {
         List<PartName> topLevelNodes = new ArrayList<>();
-        Map<String, PartName> nodeMap = nodesSet.stream()
+        Map<String, PartName> nodeMap = nodesCollection.stream()
                 .collect(Collectors.toMap(PartName::getCode, Function.identity()));
-        for (PartName node : nodesSet) {
+        for (PartName node : nodesCollection) {
             PartName parentNode = nodeMap.get(node.getParentCode());
             if (parentNode != null) {
                 if (parentNode.getChildPartNameList() == null) {