From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 f6f3c0d..f20275f 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
@@ -93,6 +93,13 @@
return R.ok(vos);
}
+ @Override
+ public ComMngVillageDO getVillageById(Long villageId) {
+ ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
+ comMngVillageDO = comActVillageDAO.selectById(villageId);
+ return comMngVillageDO;
+ }
+
@Override
public R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO) {
@@ -269,9 +276,13 @@
villageBuildingList.forEach(villageBuilding -> {
if(!villageBuilding.getFloor().contains("栋")){
villageBuilding.setFloorString(villageBuilding.getFloor() + "栋");
+ }else{
+ villageBuilding.setFloorString(villageBuilding.getFloor());
}
if(!villageBuilding.getUnitNo().contains("单元")){
villageBuilding.setUnitNoString(villageBuilding.getUnitNo() + "单元");
+ }else{
+ villageBuilding.setUnitNoString(villageBuilding.getUnitNo());
}
});
}
--
Gitblit v1.7.1