From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/OrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index ef43540..8e7ad7d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -348,13 +348,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
- wrapper.orderBy("create_time");
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
}
- return R.ok(orderLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(orderLogService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1