From 7c6fd1d806bec9791247ab84803420efe45ccd06 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 29 四月 2025 21:32:43 +0800
Subject: [PATCH] 修改家谱中搜索时一页显示条数与实际不符
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 5ec9bf1..f756ced 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -520,24 +520,24 @@
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
- List<Genealogy> allData = userList.stream().map(
- zInfoUser -> {
- Genealogy newGenealogy = new Genealogy();
- BeanUtils.copyProperties(zInfoUser, newGenealogy);
+ List<Genealogy> allData = userList.stream().map(
+ zInfoUser -> {
+ Genealogy newGenealogy = new Genealogy();
+ BeanUtils.copyProperties(zInfoUser, newGenealogy);
- if (zInfoUser.getSpouseId() != null) {
- ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+ if (zInfoUser.getSpouseId() != null) {
+ ZInfoUser spouse = getById(zInfoUser.getSpouseId());
- Genealogy spouseInfo = new Genealogy();
- BeanUtils.copyProperties(spouse,spouseInfo);
- newGenealogy.setSpouse(spouseInfo);
- spouseInfo.setIdentity(newGenealogy.getIdentity());
- spouseInfo.setSpouseName(zInfoUser.getNickName());
- newGenealogy.setSpouseName(spouse.getNickName());
- }
- System.out.println(newGenealogy);
- return newGenealogy;
- }
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ newGenealogy.setSpouse(spouseInfo);
+ spouseInfo.setIdentity(newGenealogy.getIdentity());
+ spouseInfo.setSpouseName(zInfoUser.getNickName());
+ newGenealogy.setSpouseName(spouse.getNickName());
+ }
+ System.out.println(newGenealogy);
+ return newGenealogy;
+ }
).collect(Collectors.toList());
List<Genealogy> collect = allData.stream()
.distinct()
@@ -546,18 +546,13 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize; i++) {
- if (i >= collect.size()) {
- break;
- }
- resultData.add(collect.get(i));
- }
+
// System.out.println(resultData);
// System.out.println("999999999988888888888++++++++++++++++++++++");
//
//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
- Iterator<Genealogy> it = resultData.iterator();
+ Iterator<Genealogy> it = collect.iterator();
while(it.hasNext()){
Genealogy data = it.next();
@@ -638,6 +633,13 @@
// }
//
// }
+ for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize; i++) {
+ if (i >= collect.size()) {
+ break;
+ }
+ System.out.println(i+"//////"+collect.get(i));
+ resultData.add(collect.get(i));
+ }
HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("data", resultData);
--
Gitblit v1.9.1