From 6adf5d37de9739bde5bb75c51af1846da3ce6ca4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:05 +0800
Subject: [PATCH] 房屋标签迁移user_house_label + 圈子表+点赞+文章范围

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index aa3fb5d..a0a0f72 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -77,8 +77,8 @@
     <!--房屋详情-->
     <resultMap id="houseAndHouseLabelMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
         <id property="id" column="id"/>
-        <collection property="houseLabelVOList" javaType="java.util.List"
-                    ofType="org.springblade.modules.house.vo.HouseLabelVO" autoMapping="true">
+        <collection property="userHouseLabelVOList" javaType="java.util.List"
+                    ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
             <id property="id" column="cid"/>
             <result property="remark" column="cremark"/>
         </collection>
@@ -112,8 +112,8 @@
         jh.*,
         jhl.id as cid,jhl.*,jhl.remark as cremark
         from jczz_house jh
-        left join jczz_house_label jhl on jh.house_code = jhl.house_code
-        where jh.is_deleted = 0
+        left join jczz_user_house_label jhl on jh.house_code = jhl.house_code
+        where jh.is_deleted = 0 and jhl.lable_type = 2
         and jh.house_code = #{house.houseCode}
     </select>
 

--
Gitblit v1.9.3