From 61a0679cd993690b54bce70aca39c513293af242 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 7 Mar 2022 14:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcHouseDao.xml              | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 08adc876d0..5d81fe75b7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -304,6 +304,8 @@
             and ih.id !=#{houseId}
         </if>
     </select>
+
+    <!-- 复制的 queryHouseInfo 方法 -->
     <select id="queryHouseInfoByHouseId" resultType="com.epmet.dto.result.HouseInfoDTO">
         SELECT
         ih.ID as homeId,
@@ -322,9 +324,9 @@
         ih.CUSTOMER_ID AS customerId,
         concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName
         FROM ic_house ih
-        left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id )
-        left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id )
-        left JOIN ic_building_unit u ON ( ih.BUILDING_UNIT_ID = u.ID )
+        left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')
+        left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0')
+        left JOIN ic_building_unit u ON ( ih.BUILDING_UNIT_ID = u.ID AND u.DEL_FLAG = '0')
         WHERE
         ih.DEL_FLAG = '0'
         AND ih.ID = #{houseId}