|
@@ -136,7 +136,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
|
|
.in(OrderInfo::getDepartmentId, departmentIds));
|
|
.in(OrderInfo::getDepartmentId, departmentIds));
|
|
}
|
|
}
|
|
|
|
|
|
- Map<String, OrderInfo> orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(OrderInfo::getWlnCode, Function.identity()));
|
|
|
|
|
|
+ Map<String, OrderInfo> orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(OrderInfo::getWlnCode, Function.identity(), (v1, v2) -> v2));
|
|
|
|
|
|
Set<String> wlnCodeSet = new HashSet<>(outboundMap.keySet());
|
|
Set<String> wlnCodeSet = new HashSet<>(outboundMap.keySet());
|
|
wlnCodeSet.addAll(orderInfoMap.keySet());
|
|
wlnCodeSet.addAll(orderInfoMap.keySet());
|