From 3041eb1b0b76b75b916939e77c7ae97a80fe5af3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:24:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index 1405ead..8db1a01 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -45,7 +45,11 @@
EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(AdjDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1