From c1041084ffe8ad43fb5c87098f5ad4d7115388a7 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Thu, 27 Jun 2024 17:37:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=E6=9C=89bom=20=E6=9C=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/EBomFormalTreeTask.java        | 4 +++-
 .../bomnew/service/domain/PBom/PBomFormalTreeTask.java        | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
index 104875d4..18a2d8e2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomFormalTreeTask.java
@@ -46,7 +46,9 @@ public class EBomFormalTreeTask extends RecursiveTask<List<BomNewEbomParentForma
      */
     public void handlerChildBomVersionDetail() {
 
-
+        if(CollUtil.isEmpty(bomDetail)){
+            return;
+        }
         for (BomNewEbomParentFormalVO vo:
         bomDetail ) {
             vo.setLevelNum(levelNum);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
index 7fbbef66..9afe1bcf 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomFormalTreeTask.java
@@ -49,6 +49,10 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentForma
         bomDetail ) {
             vo.setLevelNum(levelNum);
         }
+
+        if(CollUtil.isEmpty(bomDetail)){
+            return;
+        }
         SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(bomDetail, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
 
         List<Long> bomRowIds=bomDetail.stream().filter(u -> u.getBomRowId()>0 ).map(BomNewPbomParentFormalVO::getBomRowId).collect(Collectors.toList());