From 9b64e55981d3f4ce3272edb2f3a6fc5254dffb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 7 Jun 2024 15:28:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E6=AD=A3=E5=BC=8F=E8=A1=A8?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BB=85=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/master/BomNewEbomParentMapper.xml         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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 b45bd770..1e8ed57f 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
@@ -195,15 +195,9 @@
         from t_bom_new_ebom_parent a
         join (select material_no, max(current_version) current_version from t_bom_new_ebom_parent
         where status=4
-        <if test="query.showMySelfOnly == 1">
-            AND created_by = #{userCode}
-        </if>
         <include refid="whr"/>
         group by material_no) b on a.material_no=b.material_no and a.current_version=b.current_version
         where a.status=4
-        <if test="query.showMySelfOnly == 1">
-            AND a.created_by = #{userCode}
-        </if>
     </select>
 
     <sql id="getUpgradeChangeListWhr">
@@ -273,7 +267,8 @@
         and  a.`status` &lt; 4
         ) b
         on a.material_no=b.material_no
-        set a.root_is=1
+        set a.root_is=1,
+            a.user_root_is=1
         where a.`status` &lt; 4 and b.row_id is null and a.last_version_is=1 ;
 
 
@@ -312,7 +307,8 @@
     </delete>
 
     <update id="updateStateBatchByRowIds">
-        update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),edit_status=2,exception_status=1
+        update t_bom_new_ebom_parent set status=#{status} ,
+        convert_to_ebom_time=now(),release_time=now(),release_user_name=#{userName},edit_status=2,exception_status=1
         where row_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}