From ca514349d2fc7a59527c7a36402454f8097e9092 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 6 Dec 2022 19:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B6=85=E6=97=B6=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=AD=97=E6=AE=B5=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index fc3467ba..7b4ce94d 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -555,7 +555,7 @@ public class OrderController extends BaseController {
         OrderMaster orderMasterReq = new OrderMaster();
         BeanUtils.copyProperties(orderListRequest, orderMasterReq);
         // 超时查询需要排除同个师傅的主单子单同时出现
-        if (orderListRequest.getIsOverTime()) {
+        if (orderListRequest.getIsOverTime() != null && orderListRequest.getIsOverTime()) {
             List<Long> exceptWorkerIds = detailList.stream().map(OrderListResponse::getWorkerId).collect(Collectors.toList());
             orderMasterReq.setExceptWorkerIds(exceptWorkerIds);
         }