From 92a0b6679cfa99c4e13c20724dce3baea65b873a Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Fri, 29 Mar 2024 13:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 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 cc9ea12c..a5175e8f 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
@@ -1497,24 +1497,21 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) {
             //取bom信息删除
-            this.getBaseMapper().delBatch(eBomDel.getDelEBom().stream()
-                    .map(BomNewEbomParentVO::getRowId)
-                    .collect(Collectors.toList()));
+                  List<Long> parentList=  eBomDel.getDelEBom().stream().filter(u ->  (ObjectUtil.isNotNull(u.getBomRowId()) && u.getBomRowId() > 0))
+                  .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList());
+            List<Long> childList=  eBomDel.getDelEBom().stream().filter(u ->  (ObjectUtil.isNull(u.getBomRowId()) || u.getBomRowId().longValue()==0l))
+                    .map(BomNewEbomParentVO::getRowId).collect(Collectors.toList());
+
+            this.getBaseMapper().delBatch(parentList);
 
-//            List<Long> parentList=  eBomDel.getDelEBom().stream().filter(u ->  (ObjectUtil.isNotNull(u.getBomRowId()) && u.getBomRowId() > 0))
-//                    .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList());
-//            List<Long> childList=  eBomDel.getDelEBom().stream().filter(u ->  (ObjectUtil.isNull(u.getBomRowId()) || u.getBomRowId().longValue()==0l))
-//                    .map(BomNewEbomParentVO::getRowId).collect(Collectors.toList());
-//
-//
 //            QueryWrapper<BomNewEbomParentEntity> parentWrapper=new QueryWrapper<>();
 //            parentWrapper.lambda().in(BomNewEbomParentEntity::getRowId,parentList);
 //
-//            QueryWrapper<BomNewEbomChildEntity> childWrapper=new QueryWrapper<>();
-//            childWrapper.lambda().in(BomNewEbomChildEntity::getRowId,childList);
+            QueryWrapper<BomNewEbomChildEntity> childWrapper=new QueryWrapper<>();
+            childWrapper.lambda().in(BomNewEbomChildEntity::getRowId,childList);
 //
 //           this.remove(parentWrapper);
-//           SpringUtil.getBean(BomNewEbomChildService.class).remove(childWrapper);
+          SpringUtil.getBean(BomNewEbomChildService.class).remove(childWrapper);
         }else{
             VUtils.isTure(true).throwMessage("未找到你删除的数据");
         }