diff --git a/src/main/java/com/chint/application/queryies/OrderQuery.java b/src/main/java/com/chint/application/queryies/OrderQuery.java index c6ebdaab..8a9d04c1 100644 --- a/src/main/java/com/chint/application/queryies/OrderQuery.java +++ b/src/main/java/com/chint/application/queryies/OrderQuery.java @@ -557,15 +557,17 @@ public class OrderQuery { .filter(it -> it.getRouteRequestList() == null || it.getRouteRequestList().isEmpty() || it.getRouteRequestList() .stream() - .anyMatch(routeRequest -> !routeRequest.getSupplier().equals(queryData.getSupplierName()))); + .noneMatch(routeRequest -> routeRequest.getSupplier().equals(queryData.getSupplierName()))); } return stream + .filter(order -> order.getApprovalStatus() != null) .filter(order -> !order.getOrderStatus().equals(ORDER_STATUS_FINISH) && order.getApproveOrderNo() != null && order.getApproveOrderNo().getActualOrderNo() != null && order.getLegItems() != null && !order.getLegItems().isEmpty() && order.getLegItems().stream().anyMatch(leg -> !leg.getLegType().equals(LEG_TYPE_OTHER))) + .filter(order->order.getSupplierName() == null) .sorted(Comparator.comparing(RouteOrder::getUpdateTime).reversed()) .map(order -> { User user = userRepository.findByUserEmployeeNo(order.getUserId());