diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 02d979e5..2e31452a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -231,6 +231,7 @@ public abstract class EBomToPbomBase { * @param */ protected void liftingLayer() { + result.add(parent); List parentsEntList = allBomDetail.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList()); for (BomNewEbomParentVO vo : parentsEntList) { List parentEntChild = allBomDetail.stream().filter(u -> u.getParentRowId().equals(vo.getBomRowId())).collect(Collectors.toList()); @@ -513,7 +514,7 @@ public abstract class EBomToPbomBase { } parentEnt = getParent(parentEnt); } - return parentEnt; + return null; } private BomNewEbomParentVO getParent(BomNewEbomParentVO vo) {