From ea840970331a78abc2389b37d836bbecc4e05cc6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 21 四月 2025 14:37:54 +0800
Subject: [PATCH] 修改家庭管理中的导出会导出所有家族的bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
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 081ad8d..ff12c8e 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
@@ -2,19 +2,25 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -32,6 +38,9 @@
public class ZfFamilyController {
@Resource
ZfFamilyService zfFamilyService;
+
+ @Autowired
+ ZInfoUserService zInfoUserService;
@GetMapping("/all")
public AjaxResult getAllFamily(ZfFamily zfFamily){
@@ -83,7 +92,17 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
- List<ZfFamily> list = zfFamilyService.list();
+ 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()));
+ }
System.out.println("------------------");
ExcelUtil<ZfFamily> util = new ExcelUtil<>(ZfFamily.class);
util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
--
Gitblit v1.9.1