From 5e7cdc1bc48c11bea3db8fb067f51be6dfa03c81 Mon Sep 17 00:00:00 2001
From: Agent <agent@openclaw.ai>
Date: Thu, 2 Apr 2026 02:59:37 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=97=B6=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../building/service/impl/OrderServiceImpl.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
index e1ebf09..e13c949 100644
--- a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
@@ -194,11 +194,15 @@ public class OrderServiceImpl implements OrderService {
         Page<Order> result = orderMapper.selectPage(pageParam, wrapper);
         
         // 查询每个订单的明细
-        if (result.getRecords() != null) {
+        if (result.getRecords() != null && !result.getRecords().isEmpty()) {
             for (Order order : result.getRecords()) {
-                List<OrderItem> items = orderItemMapper.selectList(
-                    new LambdaQueryWrapper<OrderItem>().eq(OrderItem::getOrderId, order.getOrderId()));
-                order.setItems(items);
+                if (order.getOrderId() != null) {
+                    List<OrderItem> items = orderItemMapper.selectList(
+                        new LambdaQueryWrapper<OrderItem>().eq(OrderItem::getOrderId, order.getOrderId()));
+                    order.setItems(items);
+                } else {
+                    order.setItems(new ArrayList<>());
+                }
             }
         }