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

zqy

2025-04-21 ea840970331a78abc2389b37d836bbecc4e05cc6

 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);
    }

@@ -421,9 +428,16 @@
     * 分享给其他家族数据，通过输入名字查找所有的同名用户和家族号
    */
    @PostMapping("/byName")
    public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
    public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
    {
        return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());

        List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
        List<String> strings1= new ArrayList<>();
        for (SysUser s:strings){
            strings1.add(s.getNickName());
        }

        return zInfoUserService.findUserNameAClan(strings1);
    }

}