From fb7ca62d2854c82ac6e0a551bf921dabe6ee7bbc Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 四月 2025 15:02:24 +0800
Subject: [PATCH] 增加了二维码接口
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 35f8603..5ec9bf1 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
@@ -519,8 +519,7 @@
userList.clear();
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
- // System.out.println(userList);
- // System.out.println("---------------");
+
List<Genealogy> allData = userList.stream().map(
zInfoUser -> {
Genealogy newGenealogy = new Genealogy();
@@ -540,8 +539,6 @@
return newGenealogy;
}
).collect(Collectors.toList());
- // System.out.println(allData);
- // System.out.println("999999999988888888888++++++++++++++++++++++");
List<Genealogy> collect = allData.stream()
.distinct()
.filter((data)-> data.getIsMyFamily() == 1)
@@ -549,7 +546,7 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
+ for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize; i++) {
if (i >= collect.size()) {
break;
}
@@ -644,7 +641,7 @@
HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("data", resultData);
- resultMap.put("total", resultData.size());
+ resultMap.put("total", collect.size());
resultMap.put("pageNum", pageNum);
resultMap.put("pageSize", pageSize);
@@ -710,7 +707,6 @@
@Override
public ZInfoUser getInfoById(Long userId) {
ZInfoUser user = getInfoBysysId(userId);
-
if(user==null) {
//鍒╃敤userId鏌ヨ
--
Gitblit v1.9.1