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

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_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 )
+        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 )
+        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}