From 5fe1ea51fba01515133b870145be95ff6b7f9722 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 2 Nov 2021 16:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBuildingDao.xml       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 3f9fc515cf..2b55aaaeb8 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
@@ -292,11 +292,12 @@
     <!-- 根据neighborHoodId查询楼 -->
     <select id="baseInfoFamilyBuilding" resultType="com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO">
         SELECT
-            id AS buildingId,
-            BUILDING_NAME
-        FROM ic_building
-        WHERE DEL_FLAG  = '0'
-          AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
+            b.id AS buildingId,
+            CONCAT(nh.NEIGHBOR_HOOD_NAME,'-',b.BUILDING_NAME)
+        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'
+          AND b.NEIGHBOR_HOOD_ID = #{neighborHoodId}
     </select>