From 10c4bb6cd7ca168872638d7630f3d885edd34500 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 15 六月 2022 17:34:42 +0800
Subject: [PATCH] 大气数据历史
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 435c95c..3994e70 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -157,7 +157,7 @@
.or(w2 -> w2.like(Client::getLinkMan, keyword));
}
//鎺掑簭瀛楁
- String orderByResult = OrderByEnums.CLIENT_CREATE_TIME.getCode();
+ String orderByResult = "id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
@@ -183,7 +183,9 @@
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<Client> clientList = clientService.list(wrapper);
List<ClientDto> clientDtoList = new ArrayList<>();
--
Gitblit v1.9.3