From 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 十月 2021 17:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 a1cfcc2..1e85929 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
@@ -140,8 +140,20 @@
villageVO.setHouseTotal(villageTotal.getHouseTotal());
villageVO.setPopulationTotal(villageTotal.getPopulationTotal());
}
- villageVOList.add(villageVO);
+ //如果小区没有名字，则将街路巷和地区号拼接起来
+ if(village.getName() != null && StringUtils.isNotEmpty(village.getName())){
+ villageVO.setGroupAt(village.getName());
+ }else{
+ StringBuilder sb = new StringBuilder();
+ sb.append(village.getAlley());
+ if(!village.getHouseNum().contains("号")){
+ sb.append(village.getHouseNum() + "号");
+ }
+ villageVO.setGroupAt(sb.toString());
+ villageVO.setName(sb.toString());
+ }
+ villageVOList.add(villageVO);
});
villageVOIPage.setRecords(villageVOList);
}
--
Gitblit v1.7.1