diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index bab6b7217..24a37763c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -776,10 +776,22 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl advanceIdSet = advanceDetailEntities.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet()); List advanceEntityList = findListByIds(new ArrayList<>(advanceIdSet)); + //把advanceEntityList以orderCode为key的Map,如果value是多个只取第一个 + + Map advanceEntityMap = new HashMap<>(); if (!advanceEntityList.isEmpty()) { - advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity())); + //把advanceEntityList以orderCode进行分组 +// Map> groupedByOrderCode = advanceEntityList.stream() +// .collect(Collectors.groupingBy(TrunklineAdvanceEntity::getOrderCode)); +// advanceEntityMap = advanceEntityList.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getOrderCode, Function.identity())); + advanceEntityMap = advanceEntityList.stream() + .collect(Collectors.toMap( + TrunklineAdvanceEntity::getOrderCode, + entity -> entity, + (existing, replacement) -> existing // 只保留第一个 + )); }