From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   81 +++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 39 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 3d94165..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
@@ -13,10 +13,7 @@
 import com.ruoyi.domain.*;
 import com.ruoyi.domain.dto.*;
 import com.ruoyi.mapper.ZInfoUserMapper;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfFamilyService;
-import com.ruoyi.service.ZfRelationService;
-import com.ruoyi.service.ZfRoleService;
+import com.ruoyi.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +23,6 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
-
 /**
  * <p>
  *  鏈嶅姟瀹炵幇绫�
@@ -51,6 +47,10 @@
 
     @Resource
     private ZfRoleService zfRoleService;
+
+    @Resource
+    private ZfClanService zfClanService;
+
 
     @Override
     public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -100,22 +100,25 @@
 //    }
 
     @Override
-    public AjaxResult findInfoUserNameAClan(String nickName)
+    public AjaxResult findUserNameAClan(List<String> nickNames)
     {
+        List<ZfShareOther> shareOtherClans = new ArrayList<>();
+        for (String nickName:nickNames) {
         ZInfoUser zInfoUser = new ZInfoUser();
         zInfoUser.setNickName(nickName);
 
         LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
         List<ZInfoUser> zInfoUsers = list(lqw);
-        List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
 
         for (ZInfoUser zInfoUser1: zInfoUsers) {
-            ShareOtherClan shareOtherClan = new ShareOtherClan();
-            shareOtherClan.setNickName(zInfoUser1.getNickName());
+            ZfShareOther shareOtherClan = new ZfShareOther();
+            shareOtherClan.setUserName(zInfoUser1.getNickName());
             shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
             shareOtherClan.setClanId(zInfoUser1.getClanId());
+            shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName());
             shareOtherClans.add(shareOtherClan);
-        }
+        }}
         return AjaxResult.success(shareOtherClans);
     }
 
@@ -516,29 +519,26 @@
         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();
-                    BeanUtils.copyProperties(zInfoUser, newGenealogy);
 
-                    if (zInfoUser.getSpouseId() != null) {
-                        ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+                List<Genealogy> allData = userList.stream().map(
+                        zInfoUser -> {
+                            Genealogy newGenealogy = new Genealogy();
+                            BeanUtils.copyProperties(zInfoUser, 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;
-                }
+                            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;
+                        }
         ).collect(Collectors.toList());
-      //  System.out.println(allData);
-     //   System.out.println("999999999988888888888++++++++++++++++++++++");
         List<Genealogy> collect = allData.stream()
                 .distinct()
                 .filter((data)-> data.getIsMyFamily() == 1)
@@ -546,18 +546,13 @@
                 .collect(Collectors.toList());
         List<Genealogy> resultData = new ArrayList<>();
 
-        for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + 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,10 +633,17 @@
 //            }
 //
 //        }
+        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);
-        resultMap.put("total", resultData.size());
+        resultMap.put("total", collect.size());
         resultMap.put("pageNum", pageNum);
         resultMap.put("pageSize", pageSize);
 
@@ -707,7 +709,6 @@
     @Override
     public ZInfoUser getInfoById(Long userId) {
         ZInfoUser user = getInfoBysysId(userId);
-
 
         if(user==null) {
             //鍒╃敤userId鏌ヨ
@@ -786,6 +787,8 @@
     }
 
 
+
+
     private void recursionFindUser(List<ZInfoUser> treeList) {
         if (treeList == null || treeList.isEmpty()) {
             return;

--
Gitblit v1.9.1