From 391ea14026d1fe6417d4ce88ebedc6654b6519ad Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 01 六月 2021 13:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms
---
src/main/java/zy/cloud/wms/manager/controller/CheckController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CheckController.java b/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
index 3abb691..9f64fee 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CheckController.java
@@ -44,6 +44,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("status").orderBy("create_time", false);
+ }
return R.ok(checkService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1