From 64b4157f2a0eba1692c9996f8ff664c5095b4c2c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 16 八月 2022 17:39:34 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 edd0d31..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
@@ -80,14 +81,35 @@
@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){
+ 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);
}
- param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
- List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
- BeanUtils.copyProperties(comMngVillageDOS, vos);
- 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);
}
@Override
--
Gitblit v1.7.1