张天森
2022-10-12 3c884ccd7b51edf3b36840bf99de5edaa41a38a7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -28,6 +28,7 @@
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.service.ComMngVillageService;
import org.springframework.util.CollectionUtils;
/**
 * @author: llming
@@ -80,11 +81,34 @@
    @Override
    public R listComActVillage(ComMngVillageVO comMngVillageVO) {
        List<ComMngVillageDO> vos = Lists.newArrayList();
        LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
        param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
        param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
        List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
        BeanUtils.copyProperties(vos, comMngVillageDOS);
        if(comMngVillageVO.getCommunityId()!=null){
            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);
            if(CollectionUtils.isEmpty(comMngVillageDOS)){
                //默认添加小区
                ComMngVillageDO comMngVillageDO=new ComMngVillageDO();
                comMngVillageDO.setVillageId(1540264792718184449L);
                comMngVillageDO.setType(1);
                comMngVillageDO.setName("该社区/村暂未添加小区(院落),请先选择本项");
                comMngVillageDOS.add(comMngVillageDO);
            }
            return R.ok(comMngVillageDOS);
        }
        if(CollectionUtils.isEmpty(vos)){
            //默认添加小区
            ComMngVillageDO comMngVillageDO=new ComMngVillageDO();
            comMngVillageDO.setVillageId(1540264792718184449L);
            comMngVillageDO.setType(1);
            comMngVillageDO.setName("该社区/村暂未添加小区(院落),请先选择本项");
            vos.add(comMngVillageDO);
        }
        return R.ok(vos);
    }