From 3ee06bd46c3809fdd00e509debd97dcd039ed031 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 21:00:11 +0800
Subject: [PATCH] 修改家谱中会显示超出范围的数据&家族模块的导出
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 18 ++++++++++++++++--
1 files changed, 16 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..e4c1438 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,13 @@
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);
+
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
@@ -421,9 +428,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