From d9458503d8bf707fcaa824b6343646cc9ad0e5fd Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 19 八月 2024 12:40:10 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index 4dc57fa..b9c50c2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -113,7 +113,9 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param) throws UnsupportedEncodingException {
- condition = condition.trim();
+ if(!Cools.isEmpty(condition)){
+ condition = condition.trim();
+ }
QueryWrapper<Order> wrapper = new QueryWrapper<>();
excludeTrash(param);
wrapper.eq("status", 1);
@@ -140,6 +142,7 @@
param.remove("order_no");
allLike(Order.class, param.keySet(), wrapper, condition);
+ wrapper.orderByDesc("create_time");
return R.ok(orderService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1