diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 51907435..fb04f11f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1249,9 +1249,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             newParent.setRevertUserName(null);
             newParent.setAuditUserName(null);
             newParent.setAuditTime(null);
-            newParent.setRootIs(this.getBaseMapper().isRoot(parent.getMaterialNo())>0?0:1);
-            newParent.setUserRootIs(this.getBaseMapper().isUserRoot(parent.getMaterialNo(),SessionUtil.getUserCode())>0?0:1);
-            newParent.setRootIsForWaitReview(this.getBaseMapper().isRootIsForWaitReview(parent.getMaterialNo())>0?0:1);
+            newParent.setRootIs(1);
+            newParent.setUserRootIs(1);
             newParent.setSapState(1);
             newParent.setSapTime(null);
             newParent.setModifyTime(null);
@@ -1865,7 +1864,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             if (childEntity != null) {
 
                 //编辑查询物料id未变化
-                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) || childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
+                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) && childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
                     BeanUtil.copyProperties(childEntity, baseMaterialVO);
                     SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
                     return baseMaterialVO;