From a2fe921a5e01b7d6327e29d44e6fa58fae2f935c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 15 Mar 2024 14:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=90=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=97=B6=E5=8F=AA=E6=9C=AA=E8=BD=AC=E6=8D=A2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/OriginalBom/OriginalBomDetailTask.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java index 9e28a1b8..52bd6677 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java @@ -93,7 +93,10 @@ public class OriginalBomDetailTask extends RecursiveTask if (CollUtil.isNotEmpty(bomDetail)) { List collect = bomDetail.stream().filter(u -> Objects.isNull(u.getStatus())|| u.getStatus().equals(1)).collect(Collectors.toList()); levelNumAdd(collect.size()); - List childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList()); + List childBowIds = bomDetail.stream() + .filter(u-> Objects.equals(u.getStatus(), OriginalStatusEnum.UN_CONVERT.getValue()) && u.getChildBomRowId()!=null && u.getChildBomRowId() > 0) + .map(BomOriginalListVO::getChildBomRowId) + .collect(Collectors.toList()); if(CollUtil.isNotEmpty(childBowIds)) { List bom = SpringUtil.getBean(BomNewOriginalParentService.class).getBaseMapper().getParentChildBatch(childBowIds);