bug

zqy

2024-08-13 ca87662fba60d8c861b97c70dcb74a11b8956d60

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

@@ -3,8 +3,6 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -28,7 +26,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * <p>
@@ -68,11 +65,49 @@
    }

    @Override
    public Boolean findByuid(Long uid, Long tfid) {


        if(uid==null)
            return false;
     //   System.out.println(tfid);
     //   System.out.println("00000000000---------------");
        ZInfoUser infu = this.getById(tfid);
        if(infu==null)
            return false;
        if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
            return true;
        if(infu.getMomId()!=null && uid.equals(infu.getMomId()))
            return true;
        return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId());
    }

    @Override
    public List<ZInfoUser> selectByClanId(Integer clanId) {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setClanId(clanId);
        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        return list(lqw);
    }

    @Override
    public ZInfoUser getInfoBysysId(Long sysid) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZInfoUser::getSysId, sysid);
        List<ZInfoUser> list = list(lqw);
        return list.get(0);
        if(list.size()>0)
            return list.get(0);
        else
            return null;
    }


    @Override
    public List<ZInfoUser> getDataBySex(Integer sex){
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZInfoUser::getSex, sex);
        List<ZInfoUser> list = list(lqw);
        return list;
    }

    @Override
@@ -106,6 +141,7 @@
        lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
        lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
        return lqw;

    }
@@ -362,7 +398,8 @@
                    return people;
                }).collect(Collectors.toList());

//System.out.println("--------------++++++++++++++++--------------");
System.out.println("--------------++++++++++++++++--------------");
System.out.println(result); 
        return AjaxResult.success(result);

    }
@@ -449,7 +486,7 @@

                    if (zInfoUser.getSpouseId() != null) {
                        ZInfoUser spouse = getById(zInfoUser.getSpouseId());

                        
                        Genealogy spouseInfo = new Genealogy();
                        BeanUtils.copyProperties(spouse,spouseInfo);
                        newGenealogy.setSpouse(spouseInfo);
@@ -634,13 +671,13 @@
            String roleName = zfRoleService.getById(user.getRoleId()).getName();

            user.setRoleName(roleName);
            System.out.println("dddddddddddddddddddd");
            System.out.println(familyId);
            if(familyId!=-1)
            {
                String familyName = zfFamilyService.getById(familyId).getName();
                user.setFamilyName(familyName);
            }
//            System.out.println("dddddddddddddddddddd");
//            System.out.println(familyId);
//            if(familyId!=null&&familyId!=-1)
//            {
//                String familyName = zfFamilyService.getById(familyId).getName();
//                user.setFamilyName(familyName);
//            }
        }
        return user;
    }
@@ -781,10 +818,13 @@
//        ).collect(Collectors.toList());

        List<ZInfoUser> collect = allPeopleList.stream().filter(
                one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1)

                one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1))
        ).map(
                one -> {
                    if (depth == 1) {
                    System.out.println("++++++++++----0009999");
                    System.out.println(one);
                    if (depth == 0) {
                        one.setIdentity(people.getIdentity() + 1);
                        //根据配偶id查询配偶的数据，封装好一起返回
                        Long spouseId = one.getSpouseId();