From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
index f4df78d..1145ec5 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml
@@ -336,10 +336,10 @@
<select id="queryOwnerCarsCount" parameterType="Map" resultType="Map">
select count(1) count
from owner_car t
- left join t_dict t1 on t.car_type=t1.status_cd and t1.table_name='owner_car' and t1.table_columns = 'car_type'
- left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
t.community_id
+ left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
+ left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
<if test="memberCarNumLike !=null and memberCarNumLike != ''">
left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
</if>
@@ -425,6 +425,12 @@
#{item}
</foreach>
</if>
+ <if test="paIds !=null">
+ and pa.pa_id in
+ <foreach collection="paIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
--
Gitblit v1.8.0