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/ZfClanController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 10 +++-------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 7 +++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 7 ++++---
4 files changed, 15 insertions(+), 11 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 b46a287..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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
index 66fd587..115853c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -106,7 +106,7 @@
*/
@Log(title = "瀹舵棌璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ZfClan zfClean)
+ public void export(HttpServletResponse response, @RequestBody ZfClan zfClean)
{
List<ZfClan> list = zfClanService.selectByCondition(zfClean);
// log.info("瀵煎嚭璁板綍涓�:{}",list);
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 35f8603..4e527e9 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
@@ -519,8 +519,7 @@
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();
@@ -540,8 +539,6 @@
return newGenealogy;
}
).collect(Collectors.toList());
- // System.out.println(allData);
- // System.out.println("999999999988888888888++++++++++++++++++++++");
List<Genealogy> collect = allData.stream()
.distinct()
.filter((data)-> data.getIsMyFamily() == 1)
@@ -549,7 +546,7 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
+ for (int i = pageNum ; i < pageSize + pageNum; i++) {
if (i >= collect.size()) {
break;
}
@@ -644,7 +641,7 @@
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);
@@ -710,7 +707,6 @@
@Override
public ZInfoUser getInfoById(Long userId) {
ZInfoUser user = getInfoBysysId(userId);
-
if(user==null) {
//鍒╃敤userId鏌ヨ
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index 8cc19a4..0296820 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -106,10 +106,11 @@
@Override
public List<ZfClan> selectByCondition(ZfClan zfClan) {
-
+ System.out.println("8008888//"+zfClan.getClanId());
LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
- List<ZfClan> beanRecords = list(lambdaQueryWrapper);
- return beanRecords;
+ lambdaQueryWrapper.eq(zfClan.getClanId()!=null,ZfClan::getClanId,zfClan.getClanId());
+
+ return list(lambdaQueryWrapper);
}
@Override
--
Gitblit v1.9.1