From 07c0575f0a2fdc2aa8a80e9162d9340749b44046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 28 May 2024 17:59:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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 25790f88..a6d0d7ac 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
@@ -2569,7 +2569,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         BomNewEbomParentEntity root = getById(bomRowId);
         VUtils.isTure(Objects.isNull(root)).throwMessage("bom不存在");
         VUtils.isTure(root.getRootIs() != 1 && root.getUserRootIs() != 0).throwMessage("请选择根节点");
-        VUtils.isTure(StrUtil.equals(root.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能删除他人的数据");
+        VUtils.isTure(!StrUtil.equals(root.getCreatedBy(), SessionUtil.getUserCode())).throwMessage("不能删除他人的数据");
 
         delete(root.getRowId());
         return true;
@@ -2583,6 +2583,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .stream()
                 .map(BomNewEbomChildEntity::getMaterialNo)
                 .collect(Collectors.toSet());
+        if (CollUtil.isEmpty(materialNos)) return;
 
         List<BomNewEbomParentEntity> parents = lambdaQuery()
                 .select(BomNewEbomParentEntity::getRowId, BomNewEbomParentEntity::getCreatedBy
@@ -2590,6 +2591,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .lt(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue())
                 .in(BomNewEbomParentEntity::getMaterialNo, materialNos)
                 .list();
+        if (CollUtil.isEmpty(parents)) return;
+
         List<Long> 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())))
@@ -2601,6 +2604,18 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 .eq(BomNewEbomChildEntity::getParentRowId, bomRowId));
         this.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomParentEntity.class)
                 .eq(BomNewEbomParentEntity::getRowId, bomRowId));
+        //将自己手动创建的bom提为用户顶层
+        List<Long> 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);
+        }
 
         deleteParents.forEach(this::delete);
     }