From c119927474106ead6513f830b02bceea98dc9cde Mon Sep 17 00:00:00 2001
From: zengqinyu <2522236926@qq.com>
Date: 星期二, 22 四月 2025 18:22:40 +0800
Subject: [PATCH] 修改家谱bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 e4c1438..7d8a8a6 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
@@ -389,12 +389,9 @@
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);
+ Integer clanId = user.getClanId();
+ if(clanId != null) genealogy.setClanId(clanId);
System.out.println("11111111//"+clanId);
-
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
--
Gitblit v1.9.1