45386

whywhyo

2023-09-05 3f50e9e810b478dbbd3225d9e5cedf47f586b69b

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

@@ -401,13 +401,23 @@

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

                        Genealogy spouseInfo = new Genealogy();
                        BeanUtils.copyProperties(spouse,spouseInfo);
                        newGenealogy.setSpouse(spouseInfo);
                        spouseInfo.setIdentity(newGenealogy.getIdentity());
                        spouseInfo.setSpouseName(zInfoUser.getNickName());
                        newGenealogy.setSpouseName(spouse.getNickName());
                    }
                    return newGenealogy;
                }
        ).collect(Collectors.toList());

        List<Genealogy> collect = allData.stream().distinct().sorted(Comparator.comparing(Genealogy::getIdentity)).collect(Collectors.toList());
        List<Genealogy> collect = allData.stream()
                .distinct()
                .filter((data)-> data.getIsMyFamily() == 1)
                .sorted(Comparator.comparing(Genealogy::getIdentity))
                .collect(Collectors.toList());
        List<Genealogy> resultData = new ArrayList<>();

        for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
@@ -516,6 +526,11 @@
            BeanUtils.copyProperties(zInfoUser, genealogy);
            if (zInfoUser.getSpouseId() != null) {
                ZInfoUser spouse = getById(zInfoUser.getSpouseId());
                Genealogy spouseInfo = new Genealogy();
                BeanUtils.copyProperties(spouse,spouseInfo);
                spouseInfo.setIdentity(genealogy.getIdentity());
                spouseInfo.setSpouseName(zInfoUser.getNickName());
                genealogy.setSpouse(spouseInfo);
                genealogy.setSpouseName(spouse.getNickName());
            }
            result.add(genealogy);
@@ -541,7 +556,13 @@
            genealogy.setIdentity(params.get(i).getIdentity());
            if (zInfoUsers.get(i).getSpouseId() != null) {
                ZInfoUser spouse = getById(zInfoUsers.get(i).getSpouseId());
                Genealogy spouseInfo = new Genealogy();
                BeanUtils.copyProperties(spouse,spouseInfo);
                spouseInfo.setIdentity(genealogy.getIdentity());
                genealogy.setSpouseName(spouse.getNickName());
                spouseInfo.setSpouseName(zInfoUsers.get(i).getNickName());
                genealogy.setSpouse(spouseInfo);

            }
            result.add(genealogy);