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 parentList= eBomDel.getDelEBom().stream().filter(u -> (ObjectUtil.isNotNull(u.getBomRowId()) && u.getBomRowId() > 0)) + .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()); + List 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 parentList= eBomDel.getDelEBom().stream().filter(u -> (ObjectUtil.isNotNull(u.getBomRowId()) && u.getBomRowId() > 0)) -// .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()); -// List childList= eBomDel.getDelEBom().stream().filter(u -> (ObjectUtil.isNull(u.getBomRowId()) || u.getBomRowId().longValue()==0l)) -// .map(BomNewEbomParentVO::getRowId).collect(Collectors.toList()); -// -// // QueryWrapper parentWrapper=new QueryWrapper<>(); // parentWrapper.lambda().in(BomNewEbomParentEntity::getRowId,parentList); // -// QueryWrapper childWrapper=new QueryWrapper<>(); -// childWrapper.lambda().in(BomNewEbomChildEntity::getRowId,childList); + QueryWrapper 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("未找到你删除的数据"); }