From 888832fb82998b1dae5c18bb17673c8e347abe5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Tue, 2 Apr 2024 15:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=82=B9=E3=80=81=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95=E4=B8=9A=E5=8A=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8Dv10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index 2926925..b8e2ce3 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -110,10 +110,10 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
                     }
                     break;
                 case TM_RECOVERY:
-                    // 根据小区id查询
-                    wrapper.eq(RecycleOrder::getHousingEstateId, recycleOrderQuery.getHousingEstateId());
                     // 订单状态查询  UNPROCESSED | FINISHED
                     wrapper.eq(RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
+                    // 根据小区id查询
+                    wrapper.eqIfPresent(RecycleOrder::getHousingEstateId, recycleOrderQuery.getHousingEstateId());
                     // 散户手机号查询
                     wrapper.likeIfPresent(RecycleOrder::getClientMobile, recycleOrderQuery.getMobile());
                     break;