From ebe782f6aa7e2a72926696348114a3348918d7b7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 17 六月 2025 22:55:30 +0800
Subject: [PATCH] 修改了用户号码和用户姓名产生的uuid
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 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 684e311..483d1c3 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
@@ -84,6 +84,14 @@
}
@Override
+ public List<ZInfoUser> findByUaidToFaid(String usid) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setUaid(usid);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ return list(lqw);
+ }
+
+ @Override
public List<ZInfoUser> selectByClanId(Integer clanId) {
ZInfoUser zInfoUser = new ZInfoUser();
zInfoUser.setClanId(clanId);
@@ -520,24 +528,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 +554,13 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = pageNum-1 ; i < pageSize + pageNum-1; 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 +641,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