bug

zqy

2024-11-18 614dbe883a55006ce61cd0b17032545fac7b66b6

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

@@ -467,7 +467,25 @@
                        }
                        return people;
                    }).collect(Collectors.toList());
//

//            if(zInfoUser.getSex() != null) {
//                System.out.println("/////////////"+result);
//                result = result.stream().filter(i -> i.getSex().equals(zInfoUser.getSex())).collect(Collectors.toList());
//            }
//            if(zInfoUser.getNickName() != null){
//                System.out.println("/////////////"+result);
//                result = result.stream().filter(i -> i.getNickName().equals(zInfoUser.getNickName())).collect(Collectors.toList());
//            }
////            List<Date> dates = allPeopleList.stream().
//            if(zInfoUser.getHappenEndTime() != null && zInfoUser.getHappenStartTime() != null){
//                result = result.stream().filter(a -> a.getBirth().before(zInfoUser.getHappenEndTime())).collect(Collectors.toList());
//                Long result1 = result.stream().filter(a -> a.getBirth().after(zInfoUser.getHappenStartTime())).count();
//                System.out.println("9999999999999999999999");
//                System.out.println(result1);
//            }
//            System.out.println("9999999999999999999999");
//            System.out.println(result);

        } catch (NullPointerException e) {
            throw new RuntimeException("您在加入成员的时候没有指定该成员的父亲或者母亲");
        }
@@ -518,6 +536,9 @@
        userList.clear();
        List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
        recursionFindUser(treeList);

//        System.out.println("555555555555555555555555555555555555555555555555555555555555");

//        System.out.println(userList);
//        System.out.println("---------------");
        List<Genealogy> allData = userList.stream().map(
@@ -538,6 +559,8 @@
                    return newGenealogy;
                }
        ).collect(Collectors.toList());
//        System.out.println(allData);
//        System.out.println("999999999988888888888++++++++++++++++++++++");
        List<Genealogy> collect = allData.stream()
                .distinct()
                .filter((data)-> data.getIsMyFamily() == 1)