diff --git a/src/main/java/com/example/building/controller/PublicOrderController.java b/src/main/java/com/example/building/controller/PublicOrderController.java
index 2aad1de..106e7f7 100644
--- a/src/main/java/com/example/building/controller/PublicOrderController.java
+++ b/src/main/java/com/example/building/controller/PublicOrderController.java
@@ -33,17 +33,22 @@ public class PublicOrderController {
     @GetMapping("/orders/{orderNo}")
     public Result<Map<String, Object>> getOrderByNo(
             @PathVariable String orderNo,
-            @RequestParam String customerId) {
+            @RequestParam(required = false) String customerId) {
 
         // 查询订单
-        Order order = orderMapper.selectOne(
+        com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<Order> wrapper = 
             new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<Order>()
-                .eq(Order::getOrderNo, orderNo)
-                .eq(Order::getCustomerId, customerId)
-        );
+                .eq(Order::getOrderNo, orderNo);
+        
+        // 如果提供了customerId，则校验
+        if (customerId != null && !customerId.isEmpty()) {
+            wrapper.eq(Order::getCustomerId, customerId);
+        }
+        
+        Order order = orderMapper.selectOne(wrapper);
 
         if (order == null) {
-            return Result.error("订单不存在或客户信息不匹配");
+            return Result.error("订单不存在");
         }
 
         // 查询订单明细