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 parent, List parentChildList, List backList, int levelNum, AtomicInteger orderNum) { + void bomUpAndLowLevel(List parent, List parentChildList, List backPreList, int levelNum, AtomicInteger orderNum) { if (CollectionUtil.isNotEmpty(parentChildList)) { @@ -195,9 +195,9 @@ public class EBomForwardReport extends BaseForwardReport { Map parentEntityMap = null; if (CollUtil.isNotEmpty(bomRowIds)) { List 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 parent, List parentChildList, List backList, int levelNum, AtomicInteger orderNum) { + void bomUpAndLowLevel(List parent, List parentChildList, List backPreList, int levelNum, AtomicInteger orderNum) { if (CollectionUtil.isNotEmpty(parentChildList)) { @@ -380,9 +380,9 @@ public class PBomForwardReport extends BaseForwardReport { Map parentEntityMap = null; if (CollUtil.isNotEmpty(bomRowIds)) { List 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); }