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());