diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
index 82aa6a92..6a3a89fa 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomForFormal31.java
@@ -80,8 +80,8 @@ public class EBomToPBomForFormal31 extends EBomToPbomBase {
         check();
         //bom 提层
         liftingLayer();
-        result.forEach(u->u.setLevelNo(""));
-        generateDrawingNo(result, parent.getRowId(), "1");
+//        result.forEach(u->u.setLevelNo(""));
+//        generateDrawingNo(result, parent.getRowId(), "1");
         splitData();
         List<String> hasConvert = new ArrayList<>();
 
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 2200a299..22aeb298 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
@@ -167,8 +167,8 @@ public abstract class EBomToPbomBase {
         }
         //pbom 处于工作表
        else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
-            if (oldParent.getCreatedBy() == parentVo.getCreatedBy()) {
-                if (ConvertToPBomModelEnum.OVERRIDE.equals(convertMode.getValue())) {
+            if (oldParent.getCreatedBy().equals( parentVo.getCreatedBy())) {
+                if (ConvertToPBomModelEnum.OVERRIDE.equalsValue(convertMode.getValue())) {
                     SpringUtil.getBean(BomNewPbomChildService.class).getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldParent.getRowId()));
                     oldParent.setCurrentVersion(parentVo.getCurrentVersion());
                     oldParent.setSourceRowId(parentVo.getRowId());