From df80b16166d390b15c39f13a8b5d902b9c1aaed7 Mon Sep 17 00:00:00 2001
From: chenxiky <2868613334@qq.com>
Date: Wed, 23 Jul 2025 13:04:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E8=AE=A2=E5=8D=95=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=88=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=BE=85=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/aircraft/modules/order/biz/OrderBiz.java | 4 ++--
 .../modules/order/service/impl/OrderMainServiceImpl.java   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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