From bc1f52a05b8c593ff693355956fb4b79284b60d5 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 22 Jan 2024 16:49:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsPartNameController.java    |  4 +-
 .../standard/service/PartNameService.java     |  4 +-
 .../service/impl/PartNameServiceImpl.java     | 39 ++-----------------
 3 files changed, 7 insertions(+), 40 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 adaaf5e3..16fdf901 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
@@ -47,9 +47,9 @@ public class LawsPartNameController {
     @AutoLog(value = "企业标准-零部件树选中回显")
     @ApiOperation(value = "企业标准-零部件树选中回显", notes = "企业标准-零部件树选中回显")
     @GetMapping("/echo")
-    public Result<TreePage<PartName>> queryEcho(@RequestParam(name = "selectNodeCodes", required = false, defaultValue = "")
+    public Result<List<PartName>> queryEcho(@RequestParam(name = "selectNodeCodes", required = false, defaultValue = "")
                                                           @ApiParam("选中的节点名称") String selectNodeCodes) {
-        TreePage<PartName> list = partNameService.queryEcho(selectNodeCodes);
+        List<PartName> list = partNameService.queryEcho(selectNodeCodes);
         return Result.OK(list);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java
index 64178862..2dff1b1d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/PartNameService.java
@@ -1,7 +1,5 @@
 package com.jero.modules.laws.standard.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel;
 import com.jero.modules.laws.standard.entity.PartName;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.laws.standard.entity.TreePage;
@@ -31,5 +29,5 @@ public interface PartNameService extends IService<PartName> {
      * @param selectNodeCodes 选中的节点code
      * @return 零部件树
      */
-    TreePage<PartName> queryEcho(String selectNodeCodes);
+    List<PartName> queryEcho(String selectNodeCodes);
 }
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 ea247300..87d65dda 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
@@ -77,43 +77,12 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
     }
 
     @Override
-    public TreePage<PartName> queryEcho(String selectNodeCodes) {
-        int pageNo = 1;
-        int pageSize = 1000;
+    public List<PartName> queryEcho(String selectNodeCodes) {
+        List<String> codeList = StrUtil.split(selectNodeCodes, ',');
         LambdaQueryWrapper<PartName> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PartName::getDelFlag, YesOrNoEnum.NO.getValue())
-                .in(PartName::getCode, selectNodeCodes.split(","));
-        List<PartName> allNodes = partNameMapper.selectList(queryWrapper);
-
-        // 将所有节点转换为映射，以便快速查找
-        Map<String, PartName> nodeMap = allNodes.stream()
-                .collect(Collectors.toMap(PartName::getId, Function.identity()));
-
-        // 构建树形结构
-        List<PartName> topLevelNodes = new ArrayList<>();
-        allNodes.forEach(node -> {
-            if (node.getParentId() == null) {
-                topLevelNodes.add(node);
-            } else {
-                PartName parentNode = nodeMap.get(node.getParentId());
-                if (parentNode != null) {
-                    if (parentNode.getChildPartNameList() == null) {
-                        parentNode.setChildPartNameList(new ArrayList<>());
-                    }
-                    parentNode.getChildPartNameList().add(node);
-                }
-            }
-        });
-
-        // 实现分页逻辑
-        int start = 0;
-        int end = Math.min(start + pageSize, topLevelNodes.size());
-        List<PartName> pageData = topLevelNodes.subList(start, end);
-
-        // 封装分页信息
-        TreePage<PartName> result = new TreePage<>();
-        result.setRecords(pageData);
-        return result;
+                .in(PartName::getCode, codeList);
+        return partNameMapper.selectList(queryWrapper);
     }