From 3f48c37801300605f37c6a8b49c55399826d5226 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 8 Jul 2024 09:20:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B6=E5=AD=90=E8=8A=82=E7=82=B9=E6=97=A0bo?=
 =?UTF-8?q?m=E5=B8=A6=E4=B8=8A=E8=AE=BE=E8=AE=A1=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/EBomForwardReport.java     | 8 ++++----
 .../bomnew/service/domain/PBom/PBomForwardReport.java     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
index 3e294d95..5ccdc860 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
@@ -185,7 +185,7 @@ public class EBomForwardReport extends BaseForwardReport {
     bom 子级同步有bom版本号
      */
 
-    void bomUpAndLowLevel(List<BomNewEbomParentVO> parent, List<BomNewEbomParentVO> parentChildList, List<BomNewEbomParentVO> backList, int levelNum, AtomicInteger orderNum) {
+    void bomUpAndLowLevel(List<BomNewEbomParentVO> parent, List<BomNewEbomParentVO> parentChildList, List<BomNewEbomParentVO> backPreList, int levelNum, AtomicInteger orderNum) {
 
         if (CollectionUtil.isNotEmpty(parentChildList)) {
 
@@ -195,9 +195,9 @@ public class EBomForwardReport extends BaseForwardReport {
             Map<Long, BomNewEbomParentVO> parentEntityMap = null;
             if (CollUtil.isNotEmpty(bomRowIds)) {
                 List<BomNewEbomParentVO> bomlist = getParentList(bomRowIds);
-                if (CollUtil.isNotEmpty(backList)) {
-                    backList.clear();
-                    backList.addAll(bomlist);
+                if (Objects.nonNull(backPreList)) {
+                    backPreList.clear();
+                    backPreList.addAll(bomlist);
                 }
                 parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewEbomParentVO::getRowId);
             }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
index 95734c0f..8e627de5 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomForwardReport.java
@@ -372,7 +372,7 @@ public class PBomForwardReport  extends BaseForwardReport {
     bom 子级同步有bom版本号
      */
 
-    void bomUpAndLowLevel(List<BomNewPbomParentVO> parent, List<BomNewPbomParentVO> parentChildList, List<BomNewPbomParentVO> backList, int levelNum, AtomicInteger orderNum) {
+    void bomUpAndLowLevel(List<BomNewPbomParentVO> parent, List<BomNewPbomParentVO> parentChildList, List<BomNewPbomParentVO> backPreList, int levelNum, AtomicInteger orderNum) {
 
         if (CollectionUtil.isNotEmpty(parentChildList)) {
 
@@ -380,9 +380,9 @@ public class PBomForwardReport  extends BaseForwardReport {
             Map<Long, BomNewPbomParentVO> parentEntityMap = null;
             if (CollUtil.isNotEmpty(bomRowIds)) {
                 List<BomNewPbomParentVO> bomlist = getParentList(bomRowIds);
-                if (CollUtil.isNotEmpty(backList)) {
-                    backList.clear();
-                    backList.addAll(bomlist);
+                if (Objects.nonNull(backPreList)) {
+                    backPreList.clear();
+                    backPreList.addAll(bomlist);
                 }
                 parentEntityMap = ListCommonUtil.listToMap(bomlist, BomNewPbomParentVO::getRowId);
             }