From 0a2b65f0d1a6e4fd31edd534c5dd610c49aa7251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 28 Mar 2024 13:33:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Droot=5Fis=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/api/user/OriginalBomApi.java   | 1 +
 .../bomnew/mapper/master/BomNewOriginalParentMapper.java        | 2 +-
 .../product/bomnew/service/BomNewOriginalParentService.java     | 2 +-
 .../src/main/resources/mapper/master/BomNewEbomParentMapper.xml | 2 +-
 .../main/resources/mapper/master/BomNewOriginalParentMapper.xml | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index 458a3ab2..35887dcf 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -167,6 +167,7 @@ public class OriginalBomApi extends BaseApi {
 
         //更新-原始BOM跟节点
         CompletableFuture.runAsync(() -> {
+            originalParentService.getBaseMapper().updateRootState_1(OriginalStatusEnum.OVER_CONVERT.getValue());
             originalParentService.getBaseMapper().updateRootState_2(OriginalStatusEnum.OVER_CONVERT.getValue());
             originalParentService.getBaseMapper().updateRootState_3(OriginalStatusEnum.OVER_CONVERT.getValue());
         });
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java
index 4bcdc20c..c9bd1591 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java
@@ -38,7 +38,7 @@ public interface BomNewOriginalParentMapper extends BaseMapper<BomNewOriginalPar
     /**
      * 更新是否根节点状态
      */
-    void updateRootState_1();
+    void updateRootState_1(@Param("status") Integer status);
 
     void updateRootState_2(@Param("status") Integer status);
     void updateRootState_3(@Param("status") Integer status);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 2bf44b63..c6e062c3 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -428,7 +428,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
     public void computeLevelNumAndRootState() {
 
         try {
-            this.getBaseMapper().updateRootState_1();
+            this.getBaseMapper().updateRootState_1(OriginalStatusEnum.UN_CONVERT.getValue());
             this.getBaseMapper().updateRootState_2(OriginalStatusEnum.UN_CONVERT.getValue());
             this.getBaseMapper().updateRootState_3(OriginalStatusEnum.UN_CONVERT.getValue());
             // this.compucteLevelNum();
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 b8a9480f..294ec9fe 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,7 +195,7 @@
     <update id="updateRootState">
         update t_bom_new_ebom_parent
         set root_is=0, user_root_is=0
-        where last_version_is = 1;
+        where last_version_is = 1 AND `status` &lt; 4;
 
 
         update   t_bom_new_ebom_parent a   left join  (
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index 986de007..4f560eb6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -146,7 +146,7 @@
         update t_bom_new_original_parent
         set root_is=0,
             user_root_is=0
-        where last_version_is = 1
+        where last_version_is = 1 and `status`= #{status}
     </update>
     <!--处理根节点-->
     <update id="updateRootState_2">