From e3a07d0971fb333f4fcbaddf2f5b9600e955a914 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Thu, 8 Aug 2024 22:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=ACPBOM-=E8=A6=86=E7=9B=96=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E5=90=A6=E5=90=8C=E4=B8=80=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 480d2c32..0819b4b1 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
@@ -178,14 +178,14 @@ public abstract class EBomToPbomBase {
         }
         //pbom 处于工作表
         else if (Objects.nonNull(oldParent) && oldParent.getStatus() < EBomStatusEnum.PUBLISHED.getValue()) {
-            if (oldParent.getCreatedBy().equals(parentVo.getCreatedBy())) {
+            //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.setSourceRowId(parentVo.getRowId());
                     oldParent.setCreatedTime(LocalDateTime.now());
                     this.pBomParentResult.add(oldParent);
                     return oldParent;
-                }
+               // }
 
             } else {
                 // 降parentVo 及其子节点标记为不转换