From 3481efebb5033dd35ce6066d030873a892d1db76 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 28 十一月 2023 14:42:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 8 +++++---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index 86d5cef..95e3db7 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -112,9 +112,11 @@
convert(param, wrapper);
allLike(PriOnline2.class, param.keySet(), wrapper, condition);
wrapper.or().eq("member_id", getUserId());
- if (!Cools.isEmpty(orderByField)) {
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }
+// if (!Cools.isEmpty(orderByField)) {
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// }
+ wrapper.orderBy("update_time",false);
+ wrapper.orderBy("create_time",false);
return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index c2dbf12..ce8f0a9 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -94,6 +94,8 @@
convert(param, wrapper);
allLike(PriQuote.class, param.keySet(), wrapper, condition);
wrapper.or().eq("member_id",getUserId());
+ wrapper.orderBy("update_time",false);
+ wrapper.orderBy("create_time",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1