Merge remote-tracking branch 'origin/develop' into release_temp

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 = "";
+    }
 }

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'