From 8d21a2ee4d863a3422a1def79b9f1928c00d22aa Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 23:20:27 +0800
Subject: [PATCH] 没生效 重新上传

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   64 ++++++++++++++++++++-----------
 1 files changed, 41 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..a69475b 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,20 @@
     }
 
     @Override
+    public List<ZInfoUser> findByUaidToFaid(String usid) {
+        if(usid!=null) {
+            ZInfoUser zInfoUser = new ZInfoUser();
+            zInfoUser.setUaid(usid);
+            LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+            List<ZInfoUser> ls =  list(lqw);
+          //  System.out.println(ls.size()+":==========sdfs55dfsdf");
+            return ls;
+        }else {
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
     public List<ZInfoUser> selectByClanId(Integer clanId) {
         ZInfoUser zInfoUser = new ZInfoUser();
         zInfoUser.setClanId(clanId);
@@ -175,6 +189,8 @@
         lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
         lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
         lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
+
+        lqw.eq(zInfoUser.getUaid() !=null, ZInfoUser::getUaid, zInfoUser.getUaid());
         return lqw;
 
     }
@@ -520,24 +536,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 +562,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 +649,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