From 0ff2a6b70348e228f1759daee9cff441d6395af7 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 8 May 2025 16:51:09 +0800
Subject: [PATCH] no message

---
 .../ghy/web/controller/order/OrderController.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 7e95e1cc..9384bea2 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
@@ -1119,13 +1119,14 @@ public class OrderController extends BaseController {
 //        } else {
         orderListResponses.addAll(masterList);
 //        }
-        if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
-            if (!orderListResponses.isEmpty()){
-                orderListResponses = orderListResponses.stream()
-                                .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
-                                .collect(Collectors.toList());
-            }
-            logger.info("处理已完成以及已取消的订单{}",orderListResponses);
+        logger.info("未处理的订单{}",orderListResponses);
+        if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
+           if (orderListResponses.size()>0){
+               orderListResponses = orderListResponses.stream()
+                       .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
+                       .collect(Collectors.toList());
+           }
+            logger.info("处理已完成及已取消的订单: {}", orderListResponses);
         }
         // 查询新订单列表根据创建时间倒叙排列，查询其他根据更新时间倒序排列
         Collections.sort(orderListResponses, new Comparator<OrderListResponse>() {