定点、到站回收订单业务功能bug问题修复v10

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;