From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期三, 12 十月 2022 19:05:28 +0800 Subject: [PATCH] 三说会堂事件流程处理 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java index 565b693..24d319a 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java +++ b/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 @@ -79,8 +80,8 @@ @Override public R listComActVillage(ComMngVillageVO comMngVillageVO) { + List<ComMngVillageDO> vos = Lists.newArrayList(); 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()); @@ -90,9 +91,25 @@ } 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); } - return R.fail("暂无小区数据"); + if(CollectionUtils.isEmpty(vos)){ + //默认添加小区 + ComMngVillageDO comMngVillageDO=new ComMngVillageDO(); + comMngVillageDO.setVillageId(1540264792718184449L); + comMngVillageDO.setType(1); + comMngVillageDO.setName("该社区/村暂未添加小区(院落),请先选择本项"); + vos.add(comMngVillageDO); + } + return R.ok(vos); } @Override -- Gitblit v1.7.1