From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +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 |    4 ++++
 1 files changed, 4 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..97b4252 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
@@ -269,9 +269,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