From 2af307b1959df1ca0975365a02ce3330341fae1b Mon Sep 17 00:00:00 2001 From: 10002327 Date: Sat, 14 Sep 2024 11:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E6=8E=A7=E7=B3=BB=E7=BB=9F=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8C=85=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewEbomParentService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 ec54efbf..8cb8239b 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 @@ -997,19 +997,20 @@ public class BomNewEbomParentService extends ServiceImpl pbomParent = eBomToPBom.getPBomParentResult().stream().filter(p -> (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("直发")) || - p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作")).collect(Collectors.toList()); + (p.getMaterialDesc().contains("电控系统") && p.getMaterialDesc().contains("制作"))).collect(Collectors.toList()); eBomToPBom.getPBomParentResult().removeAll(pbomParent); //2、删掉pbom 子级的数据 List pbomChild = eBomToPBom.getPBomChildResult().stream() .filter(c -> pbomParent.stream().map(BomNewPbomParentEntity::getRowId).collect(Collectors.toList()).contains(c.getParentRowId())) .collect(Collectors.toList()); eBomToPBom.getPBomChildResult().removeAll(pbomChild); - //3、删掉ebom 父级的数据 - List ebomParentIdList = pbomParent.stream().map(BomNewPbomParentEntity::getSourceRowId).collect(Collectors.toList()); - this.delBatch(ebomParentIdList); - //4、删掉ebom 子级的数据 - ebomChildService.remove(Wrappers.lambdaQuery().in(BomNewEbomChildEntity::getParentRowId,ebomParentIdList)); - + if(!pbomParent.isEmpty()){ + //3、删掉ebom 父级的数据 + List ebomParentIdList = pbomParent.stream().map(BomNewPbomParentEntity::getSourceRowId).collect(Collectors.toList()); + this.delBatch(ebomParentIdList); + //4、删掉ebom 子级的数据 + ebomChildService.remove(Wrappers.lambdaQuery().in(BomNewEbomChildEntity::getParentRowId,ebomParentIdList)); + } } if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {