diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index 10bdf3f3..9b98255d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -101,7 +101,6 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
 
         for (String facCode : facCodes) {
             List<BomNewEbomParentVO> parentList = ListCommonUtil.toDistinct(facBomDataMp.get(facCode).stream().filter(u -> u.getBomRowId() > 0)
-                    .sorted(Comparator.comparing(BomNewEbomParentVO::getLevelNumber))
                     .collect(Collectors.toList()), BomNewEbomParentVO::getBomRowId);
             for (BomNewEbomParentVO vo : parentList) {
                 String hasConvertKey = StrUtil.join("-", facCode, vo.getBomRowId());
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 17538ceb..d2ee4af6 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
@@ -349,8 +349,9 @@ public abstract class EBomToPbomBase {
     }
 
     private void changeImpactDo(BomNewEbomParentVO parentVO) {
-        List<BomNewEbomParentVO> subVos = allBomDetail.stream().filter(u -> u.getLevelNumber().compareTo(parentVO.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(parentVO.getLevelNumber(), BigDecimal.valueOf(0.01))) < 0)
-                .sorted(Comparator.comparing(BomNewEbomParentVO::getLevelNumber)).collect(Collectors.toList());
+        List<BomNewEbomParentVO> subVos = getAllSubInListIncludeSelf(parentVO,allBomDetail);
+//        allBomDetail.stream().filter(u -> u.getLevelNumber().compareTo(parentVO.getLevelNumber()) >= 0 && u.getLevelNumber().compareTo(NumberUtil.add(parentVO.getLevelNumber(), BigDecimal.valueOf(0.01))) < 0)
+//                .sorted(Comparator.comparing(BomNewEbomParentVO::getLevelNumber)).collect(Collectors.toList());
         List<BomNewEbomParentVO> subVosParent = subVos.stream().filter(u -> u.getBomRowId() > 0).collect(Collectors.toList());
         for (BomNewEbomParentVO vo : subVosParent) {
             if (compareVirtualPackage(vo)) {
@@ -701,9 +702,9 @@ public abstract class EBomToPbomBase {
             subResult.addAll(subMaterials);
             List<Long> subMarterialBomRowIds = subMaterials.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(subMarterialBomRowIds)) {
-                getAllSubData(subMarterialBomRowIds, subResult, list);
+                subMaterials = list.stream().filter(u -> subMarterialBomRowIds.contains(u.getParentRowId())).collect(Collectors.toList());
             } else {
-                break;
+                subMaterials=Collections.emptyList();
             }
         }
     }
@@ -721,9 +722,9 @@ public abstract class EBomToPbomBase {
             subResult.addAll(subMaterials);
             List<Long> subMarterialBomRowIds = subMaterials.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(subMarterialBomRowIds)) {
-                getAllSubData(subMarterialBomRowIds, subResult);
+                subMaterials=result.stream().filter(u -> subMarterialBomRowIds.contains(u.getParentRowId())).collect(Collectors.toList());
             } else {
-                break;
+                subMaterials=Collections.emptyList();
             }
         }
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java
index 21b6646f..86b333da 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomUpgrade.java
@@ -89,6 +89,7 @@ public class PBomUpgrade {
         pbomParent.setStatus(PBomStatusEnum.WAIT_PUBLISH.getValue());
         pbomParent.setCurrentVersion(VersionUtil.getNextVersion(parentVO.getCurrentVersion()));
         pbomParent.setModifyTime(LocalDateTime.now());
+        pbomParent.setDeptRowId(SessionUtil.getDepartRowId());
         if (rootIs) {
             pbomParent.setRootIs(1);
             pbomParent.setUserRootIs(1);