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<>());
+                }
             }
         }