From 0fe3549fb6a01ccdc03672d6570b4a11ecf668eb Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:38:16 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 9ff80e9..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
@@ -80,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());
@@ -96,12 +96,20 @@
ComMngVillageDO comMngVillageDO=new ComMngVillageDO();
comMngVillageDO.setVillageId(1540264792718184449L);
comMngVillageDO.setType(1);
- comMngVillageDO.setName("默认小区");
+ 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