diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java index ed98bc11..3d4b2f13 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java @@ -116,9 +116,13 @@ public class PBomDetailTask extends RecursiveTask> { } if (CollUtil.isNotEmpty(bomDetail)) { - List childBowIds = bomDetail.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); + List childBowIds = bomDetail.stream().map(BomNewPbomParentVO::getBomRowId).filter(bomRowId -> bomRowId > 0).collect(Collectors.toList()); if (CollUtil.isNotEmpty(childBowIds)) { - List children = SpringUtil.getBean(BomNewPbomChildService.class).lambdaQuery().in(BomNewPbomChildEntity::getParentRowId, childBowIds).list(); + List children = SpringUtil.getBean(BomNewPbomChildService.class) + .lambdaQuery() + .in(BomNewPbomChildEntity::getParentRowId, childBowIds) + .orderByAsc(BomNewPbomChildEntity::getOrderNumber) + .list(); List bom = Convert.toList(BomNewPbomParentVO.class, children); PBomDetailTask task = new PBomDetailTask(bom, countLevelState,levelNum); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml index 0edcee8f..0aa28317 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml @@ -138,7 +138,10 @@