From f84b11aef58a11f50c7c0b9d39ec5ccbb92fdf10 Mon Sep 17 00:00:00 2001 From: lulz1 Date: Sat, 20 Apr 2024 21:28:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E9=A1=B5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=B0=86=E5=B7=B2=E7=BB=93=E6=9D=9F=E7=9A=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=94=BE=E5=88=B0=E6=9C=80=E5=90=8E=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/chint/application/queryies/OrderQuery.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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());