diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
index 9d29bbf5..bf3332f8 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
@@ -268,7 +268,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
                 }
 
             }
-            buildEBomChild(childVo, parentEntity.getEBomRowId());
+            buildEBomChild(childVo, parentEntity);
         }
     }
 
@@ -411,14 +411,14 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 
     }
 
-    private void buildEBomChild(BomOriginalListVO child, Long parentRowId) {
+    private void buildEBomChild(BomOriginalListVO child, BomOriginalListVO parent) {
 
 
         BomNewEbomChildEntity childEntity = new BomNewEbomChildEntity();
         BeanUtil.copyProperties(child, childEntity, "materialGetType");
         childEntity.setRowId(IdWorker.getId());
-        childEntity.setParentRowId(parentRowId);
-        childEntity.setIdentityNo(StrUtil.join("_", parentRowId.toString(), childEntity.getRowId()));
+        childEntity.setParentRowId(parent.getEBomRowId());
+        childEntity.setIdentityNo(StrUtil.join("_", parent.getEBomRowId().toString(), childEntity.getRowId()));
         childEntity.setModifyTime(LocalDateTime.now());
         childEntity.setSourceRowId(StrUtil.isNotBlank(child.getSourceRowId())?child.getSourceRowId(): child.getRowId().toString());
         //当为原材料时，数量=总重  单位改为KG  图号=编码
@@ -428,6 +428,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 //            childEntity.setDrawingNo(childEntity.getMaterialNo());
 //        }
         childEntity.setMaterialOriginalUnit(childEntity.getMaterialUnit());
+        if (parent.getMaterialNo().startsWith("31")) {
+            childEntity.setVirtualPartRootMaterialNo(parent.getMaterialNo());
+        }
         this.eBomChildResult.add(childEntity);
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 233bedd5..c9d8a6ae 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -403,7 +403,8 @@
                 created_by=#{userCode}
             </if>
             <if test="userJob==1 and query.dataType==0">
-                AND (root_is=1 OR user_root_is=1) AND status=2
+                AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR
+                root_is_for_wait_review=1) AND created_by=#{userCode})
             </if>
             <if test="userJob==1 and query.dataType==1">
                 AND (root_is=1 OR user_root_is=1) AND status=4
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
index d07cb7fb..d1f039f6 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/config/MybatisPlusHandler.java
@@ -20,22 +20,30 @@ public class MybatisPlusHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         this.strictInsertFill(metaObject, "createdBy", String.class, getUserName());
         this.strictInsertFill(metaObject, "createdTime", LocalDateTime.class, LocalDateTime.now());
-        this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
+        this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName());
         this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
 
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        this.strictInsertFill(metaObject, "updatedBy", String.class, getUserName());
+        this.strictInsertFill(metaObject, "updatedBy", String.class, getRealName());
         this.strictInsertFill(metaObject, "updatedTime", LocalDateTime.class, LocalDateTime.now());
     }
 
-    private String getUserName() {
+    private String getRealName() {
         try {
             return StrUtil.isNotBlank(SessionUtil.getRealName()) ? SessionUtil.getRealName() : SessionUtil.getUserName();
         } catch (NflgBusinessException e) {
             return "admin";
         }
     }
+
+    private String getUserName() {
+        try {
+            return SessionUtil.getUserName();
+        } catch (NflgBusinessException e) {
+            return "admin";
+        }
+    }
 }