Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
java_cuibaocheng@163.com 2023-11-30 18:09:45 +08:00
commit ea039b447e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/mybatis/mapper/house/house-mapper.xml
View File

@ -1051,6 +1051,9 @@
house_house t1 LEFT JOIN house_population t2 ON t1.house_id = t2.house_id house_house t1 LEFT JOIN house_population t2 ON t1.house_id = t2.house_id
WHERE WHERE
t1.is_delete = 0 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 != ''"> <if test="buildingId != null and buildingId != ''">
AND building_id = #{buildingId} AND building_id = #{buildingId}
</if> </if>