From da4f625170a24e294634fc775a93f481fa89d520 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, 31 May 2024 16:39:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E5=88=A0=E9=99=A4bom=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 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 83deda3c..223457a9 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
@@ -2575,26 +2575,30 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         VUtils.isTure(root.getRootIs() != 1 && root.getUserRootIs() != 0).throwMessage("请选择根节点");
         VUtils.isTure(!StrUtil.equals(root.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能删除他人的数据");
 
-        delete(root.getRowId());
+        delete(root);
 
         CompletableFuture.runAsync(this::updateLastVersionIs);
         return true;
     }
 
-    private void delete(Long bomRowId) {
+    private void delete(BomNewEbomParentEntity parent) {
+        if (!StrUtil.equals(parent.getCreatedBy(), SessionUtil.getUserCode())) {
+            return;
+        }
+
         this.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomParentEntity.class)
-                .eq(BomNewEbomParentEntity::getRowId, bomRowId));
+                .eq(BomNewEbomParentEntity::getRowId, parent.getRowId()));
 
         Set<String> materialNos = ebomChildService.lambdaQuery()
                 .select(BomNewEbomChildEntity::getMaterialNo)
-                .eq(BomNewEbomChildEntity::getParentRowId, bomRowId)
+                .eq(BomNewEbomChildEntity::getParentRowId, parent.getRowId())
                 .list()
                 .stream()
                 .map(BomNewEbomChildEntity::getMaterialNo)
                 .collect(Collectors.toSet());
 
         ebomChildService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomChildEntity.class)
-                .eq(BomNewEbomChildEntity::getParentRowId, bomRowId));
+                .eq(BomNewEbomChildEntity::getParentRowId, parent.getRowId()));
 
         if (CollUtil.isEmpty(materialNos)) return;
 
@@ -2606,23 +2610,21 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .list();
         if (CollUtil.isEmpty(parents)) return;
 
-        List<Long> deleteParents = parents.stream()
+        List<BomNewEbomParentEntity> deleteParents = parents.stream()
                 .filter(p -> (StrUtil.equals(p.getCreatedBy(), SessionUtil.getUserCode())
                         && (Objects.equals(p.getSource(), EBomSourceEnum.FROM_BOM.getValue()) || Objects.equals(p.getSource(), EBomSourceEnum.FROM_EXCE.getValue())))
                         || Objects.equals(p.getVirtualPackageIs(), 1))
-                .map(BomNewEbomParentEntity::getRowId)
                 .collect(Collectors.toList());
         //将自己手动创建的bom提为用户顶层
-        List<Long> updateParents = parents.stream()
+        List<BomNewEbomParentEntity> updateParents = parents.stream()
                 .filter(p -> StrUtil.equals(p.getCreatedBy(), SessionUtil.getUserCode()))
-                .map(BomNewEbomParentEntity::getRowId)
                 .collect(Collectors.toList());
         updateParents.removeAll(deleteParents);
         if (CollUtil.isNotEmpty(updateParents)) {
             this.lambdaUpdate()
                     .set(BomNewEbomParentEntity::getUserRootIs, 1)
                     .set(BomNewEbomParentEntity::getModifyTime, LocalDateTime.now())
-                    .in(BomNewEbomParentEntity::getRowId, updateParents);
+                    .in(BomNewEbomParentEntity::getRowId, updateParents.stream().map(BomNewEbomParentEntity::getRowId).collect(Collectors.toList()));
         }
 
         deleteParents.forEach(this::delete);