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 83deda3c..223457a9 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 @@ -2575,26 +2575,30 @@ public class BomNewEbomParentService extends ServiceImpl materialNos = ebomChildService.lambdaQuery() .select(BomNewEbomChildEntity::getMaterialNo) - .eq(BomNewEbomChildEntity::getParentRowId, bomRowId) + .eq(BomNewEbomChildEntity::getParentRowId, parent.getRowId()) .list() .stream() .map(BomNewEbomChildEntity::getMaterialNo) .collect(Collectors.toSet()); ebomChildService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewEbomChildEntity.class) - .eq(BomNewEbomChildEntity::getParentRowId, bomRowId)); + .eq(BomNewEbomChildEntity::getParentRowId, parent.getRowId())); if (CollUtil.isEmpty(materialNos)) return; @@ -2606,23 +2610,21 @@ public class BomNewEbomParentService extends ServiceImpl deleteParents = parents.stream() + List deleteParents = parents.stream() .filter(p -> (StrUtil.equals(p.getCreatedBy(), SessionUtil.getUserCode()) && (Objects.equals(p.getSource(), EBomSourceEnum.FROM_BOM.getValue()) || Objects.equals(p.getSource(), EBomSourceEnum.FROM_EXCE.getValue()))) || Objects.equals(p.getVirtualPackageIs(), 1)) - .map(BomNewEbomParentEntity::getRowId) .collect(Collectors.toList()); //将自己手动创建的bom提为用户顶层 - List updateParents = parents.stream() + List updateParents = parents.stream() .filter(p -> StrUtil.equals(p.getCreatedBy(), SessionUtil.getUserCode())) - .map(BomNewEbomParentEntity::getRowId) .collect(Collectors.toList()); updateParents.removeAll(deleteParents); if (CollUtil.isNotEmpty(updateParents)) { this.lambdaUpdate() .set(BomNewEbomParentEntity::getUserRootIs, 1) .set(BomNewEbomParentEntity::getModifyTime, LocalDateTime.now()) - .in(BomNewEbomParentEntity::getRowId, updateParents); + .in(BomNewEbomParentEntity::getRowId, updateParents.stream().map(BomNewEbomParentEntity::getRowId).collect(Collectors.toList())); } deleteParents.forEach(this::delete);