diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
index 95cdf07..9182082 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
@@ -177,9 +177,9 @@ public class OrderBiz {
      * @return  {@link List<OrderMain>}
      */
     private List<OrderMain> adminAllOrderQueryList(OrderMainPageQueryDTO pageQueryDTO) {
-        // 需要考虑用户角色获取对应的数据
+        // TODO 需要考虑用户角色获取对应的数据（财务、区域、管理员角色）
         List<OrderMain> list = orderMainService.queryAll(pageQueryDTO);
-        return null;
+        return list;
     }
 
     public ResponseEntity<PageResult<Object>> relevanceOrder() {
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java
index a9c41db..11c49cd 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java
@@ -1,5 +1,6 @@
 package com.aircraft.modules.order.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.aircraft.modules.order.domain.OrderMain;
 import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
@@ -34,9 +35,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
         // TODO 构建查询条件
         LambdaQueryWrapper<OrderMain> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OrderMain::getAttractionId, pageQueryDTO.getAttractionId());
-        queryWrapper.eq(OrderMain::getCustomerId, pageQueryDTO.getCustomerId());
-        queryWrapper.eq(OrderMain::getPhone, pageQueryDTO.getPhone());
+        queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getAttractionId, pageQueryDTO.getAttractionId());
+        queryWrapper.eq(ObjectUtil.isNotNull(pageQueryDTO.getAttractionId()),OrderMain::getCustomerId, pageQueryDTO.getCustomerId());
+        queryWrapper.eq(StrUtil.isNotBlank(pageQueryDTO.getPhone()),OrderMain::getPhone, pageQueryDTO.getPhone());
         return list(queryWrapper);
     }