From d17dda0483292e3e4afec53fb65f59d59bbc7c8c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 15 Nov 2021 14:21:15 +0800
Subject: [PATCH] emm

---
 .../epmet/dto/result/BaseInfoFamilyBuildingResultDTO.java    | 5 +++++
 .../src/main/resources/mapper/IcBuildingDao.xml              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BaseInfoFamilyBuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BaseInfoFamilyBuildingResultDTO.java
index ea5b86e2e6..b905c43166 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BaseInfoFamilyBuildingResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BaseInfoFamilyBuildingResultDTO.java
@@ -23,4 +23,9 @@ public class BaseInfoFamilyBuildingResultDTO implements Serializable {
      * 楼栋名字
      */
     private String buildingName;
+
+    public BaseInfoFamilyBuildingResultDTO() {
+        this.buildingId = "";
+        this.buildingName = "";
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 2091daeba8..df3ef06fa0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -295,7 +295,7 @@
     <select id="baseInfoFamilyBuilding" resultType="com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO">
         SELECT
             b.id AS buildingId,
-            CONCAT(nh.NEIGHBOR_HOOD_NAME,'-',b.BUILDING_NAME)
+            IFNULL(CONCAT(nh.NEIGHBOR_HOOD_NAME,'-',b.BUILDING_NAME),'') AS buildingName
         FROM ic_building b
         LEFT JOIN ic_neighbor_hood nh ON (nh.ID = b.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0')
         WHERE b.DEL_FLAG  = '0'