From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
index c6afb1c..c82dff2 100644
--- a/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml
@@ -9,11 +9,14 @@
select count(1) count
from building_room t
- left join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
- left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
- left join building_owner bo on borr.owner_id = bo.owner_id and bo.status_cd = '0'
+ inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+ inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ <if test="ownerId != null and ownerId != ''">
+ inner join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
+ left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
+ </if>
where 1=1
+ and t.status_cd = '0'
<if test="floorId != null and floorId != ''">
and f.floor_id = #{floorId}
</if>
@@ -58,10 +61,10 @@
t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
f.floor_num floorNum,bu.unit_num unitNum,bo.name ownerName,bo.owner_id ownerId,bo.link
from building_room t
- left join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
- left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
- left join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
- left join building_owner bo on borr.owner_id = bo.owner_id and bo.status_cd = '0'
+ inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+ inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ inner join building_owner_room_rel borr on t.room_id = borr.room_id and borr.status_cd = '0'
+ left join building_owner bo on borr.owner_id = bo.member_id and bo.status_cd = '0'
where 1=1
<if test="floorId != null and floorId != ''">
and f.floor_id = #{floorId}
--
Gitblit v1.8.0