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 exceptWorkerIds = detailList.stream().map(OrderListResponse::getWorkerId).collect(Collectors.toList()); orderMasterReq.setExceptWorkerIds(exceptWorkerIds); }