From ba74d0301b1cdb43a510c452fadc3684069fe49c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 09:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index cb41922..a0e942c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -201,8 +201,7 @@
wrapper.eq(TShoppingOrder::getStatus, query.getStatus());
}
long count = this.count(wrapper);
- Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
- List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + pageCurr + ", " + query.getPageSize()));
+ List<TShoppingOrder> list = this.list(wrapper.orderByDesc(TShoppingOrder::getCreateTime).last(" limit " + query.getPageCurr() + ", " + query.getPageSize()));
List<MyShoppingOrderList> pageList = new ArrayList<>();
for (TShoppingOrder tShoppingOrder : list) {
MyShoppingOrderList myShoppingOrderList = new MyShoppingOrderList();
--
Gitblit v1.7.1