bug

zqy

2025-04-22 898bd4e44b8b0abe35cf98bf104aec44ec06dee2

bug

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

@@ -137,12 +137,12 @@
    }
    @GetMapping("/{id}")
    public AjaxResult getInfoById(@PathVariable("id") Long id) {
      //  SysUser user = SecurityUtils.getLoginUser().getUser();
        //  SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = id;


        //查询sys_user表
      //  SysUser sysUser = sysUserService.selectUserById(userId);
        //  SysUser sysUser = sysUserService.selectUserById(userId);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//
@@ -164,7 +164,7 @@
        LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
        uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.update(uw));
            //    saveOrUpdate(zInfoUser));
        //    saveOrUpdate(zInfoUser));
    }

    @Log(title = "个人详细信息记录", businessType = BusinessType.INSERT)
@@ -192,7 +192,7 @@
//        us.setRemark(user.getRemark());
        userService.updateUser(user);
        //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
       // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
        return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
        //    saveOrUpdate(zInfoUser));
    }
@@ -258,29 +258,29 @@
     * 根据用户id判断是否是子孙 tpfid:自己id 根据用户id判断是否是异性  不是本家的人选
     */
    @GetMapping("/uidAndUJd/{tpfid}/{sex}/{clanId}")
        public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex, @PathVariable("clanId")  Integer clanId)
        {
    public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex, @PathVariable("clanId")  Integer clanId)
    {
//            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
            //sex == 0 -> 男
            if (sex == 1){
                sex = 0;
            }
            else if (sex == 0){
                sex = 1;
            }
            List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
            List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
            HashMap<Long,String> bs = new HashMap<>();
            for (ZInfoUser zInfoUser:zInfoUsers) {
                    if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
                        bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());

                    }

            }
            satisfyIds.add(bs);
            return AjaxResult.success(satisfyIds);
        //sex == 0 -> 男
        if (sex == 1){
            sex = 0;
        }
        else if (sex == 0){
            sex = 1;
        }
        List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex, clanId);
        List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
        HashMap<Long,String> bs = new HashMap<>();
        for (ZInfoUser zInfoUser:zInfoUsers) {
            if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid) && (zInfoUser.getMaritalStatus() == null || zInfoUser.getMaritalStatus() != 1)){
                bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());

            }

        }
        satisfyIds.add(bs);
        return AjaxResult.success(satisfyIds);
    }

    /**
     * 根据用户id判断是否是子孙 uid:长辈id,tpfid:我自己的zinfoid
@@ -351,10 +351,10 @@
     * 根据家庭成员找到所有人
     */
    @GetMapping("/allFamInfo")
        public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
        {
            return zInfoUserService.listAllFamilyPeople(clanId);
        }
    public AjaxResult listAllFamilyPeople(@PathParam("clanId") Integer clanId)
    {
        return zInfoUserService.listAllFamilyPeople(clanId);
    }

    /**
     * 找到所有的成员
@@ -388,16 +388,10 @@
    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();
        Integer clanId = user.getClanId();
        genealogy.setClanId(clanId);
        if(clanId != null) genealogy.setClanId(clanId);
        System.out.println("11111111//"+clanId);
        return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
    }

@@ -429,7 +423,7 @@

    /**
     * 分享给其他家族数据，通过输入名字查找所有的同名用户和家族号
    */
     */
    @PostMapping("/byName")
    public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
    {
@@ -443,5 +437,4 @@
        return zInfoUserService.findUserNameAClan(strings1);
    }

}

}