From 9eb0dcd64fceb94d27894eb7125cfdb12e13ac46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 24 Dec 2023 10:21:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BD=ACEBOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/OriginalBom/OriginalBomToEBomConvert.java  | 1 +
 .../main/resources/mapper/master/BomNewEbomParentMapper.xml   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
index b06d6191..b19deace 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
@@ -231,6 +231,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         eBomParent.setConvertToEbomTime(LocalDateTime.now());
         eBomParent.setSourceRowId(parentEnt.getBomRowId());
         eBomParent.setLastVersionIs(1);
+        eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
         eBomParent.setModifyTime(LocalDateTime.now());
         eBomParent.setBomExist(parentEnt.getBomRowId()>0?1:0);
         //工艺岗直接到已复核
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 b7f70961..5c25c696 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
@@ -82,12 +82,12 @@
     <!--Ebom工作列表-->
     <select id="getEBomListPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
         <if test="job==0">
-            select * ,row_id as bomRowId from t_bom_new_ebom_parent where status=1 and created_by=#{createdBy} and user_root_is=1 and
+            select * ,row_id as bomRowId from t_bom_new_ebom_parent where   created_by=#{createdBy} and user_root_is=1 and
             (status=1 or status=3)
             <include refid="whr"/>
         </if>
         <if test="job==1">
-            select * ,row_id as bomRowId from t_bom_new_ebom_parent where status=2 and user_root_is=1 and ( status=2 or status=4 )
+            select * ,row_id as bomRowId from t_bom_new_ebom_parent where   user_root_is=1 and ( status=2 or status=4 )
             <include refid="whr"/>
         </if>
     </select>