From 9a4b09e6a32b4510e1e9c4fb13d6cb90b896abe4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 16 七月 2024 21:23:26 +0800
Subject: [PATCH] 修改分页查询
---
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 | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 2d491c2..570aa81 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -160,6 +160,7 @@
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
+ infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
if(user.getSpouseId()!=null) {
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 1dee4e7..c2c4840 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,7 +30,7 @@
return data;
}
- public static HashMap<String,Object> getResult(Page pageResult, List record){
+ public static HashMap<String,Object> getShareResult(Page pageResult, List record){
HashMap<String, Object> data = new HashMap<>();
data.put("data",record);
data.put("total",record.size());
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 8517635..05e4b74 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.getResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record);
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 904100a..7f203dc 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);
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.getResult(zfDoctorPage, record);
+ HashMap<String, Object> data = MapUtils.getShareResult(zfDoctorPage, record);
return AjaxResult.success(data);
}
--
Gitblit v1.9.1