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 26a34088..99df20be 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
@@ -1001,13 +1001,14 @@ public class OrderController extends BaseController {
                 allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
             }
         }
+
         // 查询主单
         OrderMaster orderMasterReq = new OrderMaster();
         BeanUtils.copyProperties(orderListRequest, orderMasterReq);
         orderMasterReq.setExceptOrderMasterIds(masterIdSet);
         List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq);
         allList.addAll(masterList);
-        logger.info("符合条件的主单数据{}",masterList);
+        logger.info("符合条件的主单数据{}总数{}allList的数量{}",masterList,count,allList.size());
         // 超时查询需要排除同个师傅的主单子单同时出现
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
             // 需要排除同个师傅的主单子单同时出现
@@ -1036,7 +1037,8 @@ public class OrderController extends BaseController {
 
             }
             count += filteredMasterList.size();
-            if (filteredMasterList.isEmpty()){
+            logger.info("主单filteredMasterList超时数量{}总数{}",filteredMasterList.size(),count);
+            if (CollectionUtils.isEmpty(filteredMasterList)){
                 count += masterList.size();
             }
         } else {