From ea8f6f47d4aaf784d2247abb7f53bd63044765fa Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 27 Dec 2023 14:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java    | 7 +++----
 .../nflg/product/bomnew/service/domain/EBom/EBomDel.java   | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

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 ad0b647b..a4d6452e 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
@@ -392,7 +392,6 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     }
 
 
-
     /**
      * 初始化bom 异常信息
      *
@@ -1001,7 +1000,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         eBomDel.classifyBom();
 
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
-            this.getBaseMapper().delBatch(eBomDel.getDelEBom().stream().map(BomNewEbomParentVO::getRowId).collect(Collectors.toList()));
+            this.getBaseMapper().delBatch(eBomDel.getDelEBom().stream().map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()));
         }
 
 
@@ -1012,8 +1011,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         }
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
 
-            ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
-
+            //  ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
+            computeLevelNumAndRootState();
         }
 
         return true;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java
index 9e7dea90..f359d7f7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java
@@ -46,7 +46,6 @@ public class EBomDel {
         //工艺岗位角色的时候，只能删除自己在EBOM中创建的数据
         //设计人员在Ebom中创建的数据 工艺人员可以删除？
        // 原始bom导入过来的只能 设计人员自己删，工艺不能删
-
         if(roleList.contains(EBomConstant.DESIGNER)){
             delEBom = bomTreeAll.stream().filter(u -> u.getBomRowId() > 0
                         && u.getCreatedBy().equals(SessionUtil.getUserCode())