Merge remote-tracking branch 'origin/upgrade' into upgrade

2023-11-30 18:09:45 +08:00 · 2023-11-30 18:09:45 +08:00 · ea039b447e
commit ea039b447e
parent cd5cd37685 965775f9ba
1 changed files with 3 additions and 0 deletions
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@ -1051,6 +1051,9 @@
        house_house t1 LEFT JOIN house_population t2 ON t1.house_id = t2.house_id
        WHERE
        t1.is_delete = 0
+        AND t2.is_delete = 0
+        AND (t2.out_house = 0
+        OR t2.out_house IS NULL)
        <if test="buildingId != null and buildingId != ''">
            AND building_id = #{buildingId}
        </if>