From 0fa28f3b1a9d196c415f09bd3538fecdabbb6d64 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:54:21 +0800
Subject: [PATCH] 家谱展示问题

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 57a304d..df36b68 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -388,6 +388,16 @@
     public AjaxResult listGenealogy(Genealogy genealogy){
         Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        Long userId = user.getUserId();
+//        System.out.println("11111111//"+userId);
+//        Integer clanId=zInfoUserService.getInfoBysysId(userId).getClanId();
+//        genealogy.setClanId(clanId);
+//        System.out.println("11111111//"+clanId);
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Integer clanId = user.getClanId();
+        genealogy.setClanId(clanId);
         return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
     }
 
@@ -421,9 +431,16 @@
      * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
     */
     @PostMapping("/byName")
-    public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+    public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
     {
-        return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+
+        List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
+        List<String> strings1= new ArrayList<>();
+        for (SysUser s:strings){
+            strings1.add(s.getNickName());
+        }
+
+        return zInfoUserService.findUserNameAClan(strings1);
     }
 
 }

--
Gitblit v1.9.1