From 50e278e21fb6086235a8557e4305add62349b197 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:38:37 +0800
Subject: [PATCH] 修改分享的total
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java | 4 ++--
3 files changed, 5 insertions(+), 5 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());
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java
index 05e4b74..71f8424 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorDownloadServiceImpl.java
@@ -73,7 +73,7 @@
int totalPage = (bs.size() -1) / pageSize +1;
Page<ZfDoctor> zfDoctorPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record,bs.size());
return AjaxResult.success(data);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
index 48b9bec..93fdac1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
@@ -115,7 +115,7 @@
int totalPage = (beanRecord3.size() -1) / pageSize +1;
Page<ZfDoctor> zfDoctorPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record,beanRecord3.size());
return AjaxResult.success(data);
}
@@ -179,7 +179,7 @@
int totalPage = (bs.size() -1) / pageSize +1;
Page<ZfDoctor> zfDoctorPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record,bs.size());
return AjaxResult.success(data);
}
--
Gitblit v1.9.1