101captain
2022-06-23 d153e0f3677ed9725e13648b39d6d710ac4bdbe4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -79,17 +79,20 @@
    @Override
    public R listComActVillage(ComMngVillageVO comMngVillageVO) {
        List<ComMngVillageDO> vos = Lists.newArrayList();
        LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
        if(StringUtils.isNotEmpty(comMngVillageVO.getName())){
            param.like(ComMngVillageDO::getName, comMngVillageVO.getName());
        if(comMngVillageVO.getCommunityId()!=null){
            List<ComMngVillageDO> vos = Lists.newArrayList();
            LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
            if(StringUtils.isNotEmpty(comMngVillageVO.getName())){
                param.like(ComMngVillageDO::getName, comMngVillageVO.getName());
            }
            if(comMngVillageVO.getCommunityId()!=0){
                param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
            }
            List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
            BeanUtils.copyProperties(comMngVillageDOS, vos);
            return R.ok(comMngVillageDOS);
        }
        if(comMngVillageVO.getCommunityId()!=0){
            param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
        }
        List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
        BeanUtils.copyProperties(comMngVillageDOS, vos);
        return R.ok(comMngVillageDOS);
        return R.fail("暂无小区数据");
    }
    @Override