From bdc5d99198b06b9e3fd5e6794d2efea36398b60a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 11:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
index ca71f3a..1daddef 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -53,6 +53,12 @@
<if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
</if>
+ <if test="propertyCompanyDistrict.districtIds != null and propertyCompanyDistrict.districtIds.size()>0">
+ and jpcd.district_id in
+ <foreach collection="propertyCompanyDistrict.districtIds" item="id" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
</select>
<select id="getDistictUserByCode" resultType="org.springblade.modules.system.vo.UserVO">
@@ -67,7 +73,7 @@
LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id
LEFT JOIN jczz_doorplate_address jda ON jda.aoi_code = jd.aoi_code
WHERE
- jda.address_code = #{houseCode}
+ jda.address_code = #{houseCode} and bu.is_deleted = 0
</select>
--
Gitblit v1.9.3