From 98cd4713254614381ede8fa42d0820a3ffc1d53e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 18 十月 2024 10:36:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java
index c2c4840..2d11112 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java
@@ -30,10 +30,10 @@
return data;
}
- public static HashMap<String,Object> getShareResult(Page pageResult, List record){
+ public static HashMap<String,Object> getShareResult(Page pageResult, List record,long total){
HashMap<String, Object> data = new HashMap<>();
data.put("data",record);
- data.put("total",record.size());
+ data.put("total",total);
data.put("pageNo",pageResult.getCurrent());
data.put("totalPage",pageResult.getTotal());
data.put("pageSize",pageResult.getSize());
--
Gitblit v1.9.1