815646

whywhyo

2023-08-27 a2e4f4e2aad027c72799588ec2a4deac73779e17

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

@@ -326,16 +326,15 @@
     */
    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.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, 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))
@@ -374,6 +373,9 @@
//        )


//        if(genealogy.getIdentity()!=null){
//            result = result.stream().filter(data -> data.getIdentity() == genealogy.getIdentity()).collect(Collectors.toList());
//        }

        return AjaxResult.success(result);

@@ -424,24 +426,42 @@
            if(genealogy.getIdentity()!=null){
                if(data.getIdentity()!=genealogy.getIdentity()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getNickName()!=null){
                if(!data.getNickName().contains(genealogy.getNickName())){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getSex()!=null){
                if(data.getSex()!=genealogy.getSex()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getPhoneNumber()!=null){
                if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getUnit()!=null){
                if(data.getUnit()!=genealogy.getUnit()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getBirth()!=null){
                if(data.getBirth()!=genealogy.getBirth()){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();
                    continue;
                }
            }
        }