From cb22e2441394cd61116d64a844708ca9390a0529 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:43:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 904100a..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.getResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record,beanRecord3.size());
return AjaxResult.success(data);
}
@@ -162,7 +162,7 @@
* 鐢ㄦ埛鑷繁鏌ョ湅鍒汉鍒嗕韩鐨勬暟鎹�==鐢ㄦ埛鑷繁鏌ョ湅鍒汉鍒嗕韩鐨勬暟鎹拰鍒嗕韩浜�
*/
@Override
- public AjaxResult listUserId(ShareMore zfDoctorInteger,Integer pageNo ,Integer pageSize) {
+ public AjaxResult listUserId(Integer pageNo ,Integer pageSize) {
//鎵惧埌瀵瑰簲鐨勮祴浜堟暟鎹殑鐢ㄦ埛浠ュ強鏁版嵁鍐呭
List<ZfDoctor> bs = new ArrayList<>();
LambdaQueryWrapper<ZfDoctorShare> lqw = new LambdaQueryWrapper<>();
@@ -179,7 +179,7 @@
int totalPage = (bs.size() -1) / pageSize +1;
Page<ZfDoctor> zfDoctorPage = new Page<>(pageNo, pageSize,totalPage);
- HashMap<String, Object> data = MapUtils.getResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record,bs.size());
return AjaxResult.success(data);
}
--
Gitblit v1.9.1