修改家庭管理中的导出会导出所有家族的bug

zqy

2025-04-21 ea840970331a78abc2389b37d836bbecc4e05cc6

修改家庭管理中的导出会导出所有家族的bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -388,12 +388,12 @@
    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);
//        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);
    }

 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, "家庭大事件记录数据");

 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java

@@ -27,6 +27,9 @@
    ZfFamily getByName(String familyName, Integer clanId);
    ZfFamily getByFid(Long fid);
    ZfFamily getByFamId(Long fid);

    List<ZfFamily> getByClanId(Long clanId);

    List<UserInfoDto> getByFamilyId(Long fid);

    List<UserInfoDto> getNowMember();

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java

@@ -88,6 +88,12 @@
        lqw.eq(ZfFamily::getId,fid);
        return getOne(lqw);
    }
    @Override
    public List<ZfFamily> getByClanId(Long clanId){
        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZfFamily::getClanId,clanId);
        return list(lqw);
    }

    @Override
    public List<UserInfoDto> getByFamilyId(Long fid) {