From 56ac3bb2620634fe4b3b4576e0fdb25c23ecf016 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Mon, 8 May 2023 14:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/sync/BasicExportStatusRequest.java    | 1 +
 .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java
index 8ee5134e..713fab84 100644
--- a/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java
+++ b/src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java
@@ -13,4 +13,5 @@ public class BasicExportStatusRequest extends ListPageRequest {
     public Integer createType;
     private String syncTime;
     private String receiveStatus;
+    private String orderBy;
 }
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 52d54744..428fc6ec 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -140,7 +140,7 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
-        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime));
+        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).le(lastUpdateTime != null, "updateTime", lastUpdateTime));
     }