whywhyo
2023-08-15 66f842583f1d3980897cd0556b43a2de00078d6d
78949865
1个文件已修改
18 ■■■■ 已修改文件
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -326,16 +326,16 @@
     */
    public AjaxResult listWithTreeByCondition(Integer depth, Genealogy genealogy) {
//        ZInfoUser zInfoUser = new ZInfoUser();
//        BeanUtils.copyProperties(genealogy, zInfoUser);
//        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
//        lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity());
//        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
//        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        ZInfoUser zInfoUser = new ZInfoUser();
        BeanUtils.copyProperties(genealogy, zInfoUser);
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity());
        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
        lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
//        List<ZInfoUser> allPeopleList = list(lqw);
        List<ZInfoUser> allPeopleList = list();
        List<ZInfoUser> allPeopleList = list(lqw);
//        List<ZInfoUser> allPeopleList = list();
        List<ZInfoUser> result = null;
        try {
            result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0))