From 4b3f310c689b303de7ea658cbce955e18b965372 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 27 Nov 2024 21:39:40 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PmFormDataServiceImpl.java      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
index 2a9b699d..51954af4 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
@@ -177,14 +177,16 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         if (!CollectionUtils.isEmpty(pmFormDataDtos)){
             List<String> parents = pmFormDataDtos.stream().map(PmFormDataDto::getId).collect(Collectors.toList());
             List<PmFormDataDto> childs = this.baseMapper.selectChilds(parents);
-            Map<String, List<PmFormDataDto>> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id));
-            for (PmFormDataDto dataDto : pmFormDataDtos) {
-                List<PmFormDataDto> children = childMap.get(dataDto.getId());
-                for (PmFormDataDto child : children) {
-                    String productArea = child.getForm_data().getString("product_area");
-                    child.setProduct_area(productArea);
+            if (!CollectionUtils.isEmpty(childs)){
+                Map<String, List<PmFormDataDto>> childMap = childs.stream().collect(Collectors.groupingBy(PmFormDataDto::getParent_id));
+                for (PmFormDataDto dataDto : pmFormDataDtos) {
+                    List<PmFormDataDto> children = childMap.get(dataDto.getId());
+                    for (PmFormDataDto child : children) {
+                        String productArea = child.getForm_data().getString("product_area");
+                        child.setProduct_area(productArea);
+                    }
+                    dataDto.setChildren(children);
                 }
-                dataDto.setChildren(children);
             }
         }
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());