From 0fa28f3b1a9d196c415f09bd3538fecdabbb6d64 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:54:21 +0800
Subject: [PATCH] 家谱展示问题
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 19 ++++++++++---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 3 +++
3 files changed, 14 insertions(+), 10 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 0dd4245..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
@@ -395,6 +395,9 @@
// 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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index ff12c8e..9ceb213 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -9,6 +10,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZCertificate;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
@@ -95,17 +97,16 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- Integer clanId=null;
- System.out.println("5050"+userId);
- ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
- if(infoBysysId !=null) clanId=infoBysysId.getClanId();
- List<ZfFamily> list = new ArrayList<>();
- if(clanId != null) {
- list.addAll(zfFamilyService.getByClanId(clanId.longValue()));
- }
+ Integer clanId = user.getClanId();
+ LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZfFamily::getClanId,clanId);
+ List<ZfFamily> list = zfFamilyService.list(lqw);
+ //.list();
+
+
System.out.println("------------------");
ExcelUtil<ZfFamily> util = new ExcelUtil<>(ZfFamily.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, 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 4e527e9..684e311 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
@@ -546,7 +546,7 @@
.collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
- for (int i = pageNum ; i < pageSize + pageNum; i++) {
+ for (int i = pageNum-1 ; i < pageSize + pageNum-1; i++) {
if (i >= collect.size()) {
break;
}
--
Gitblit v1.9.1