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 | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 fdcc0c4..1daddef 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="org.springblade.modules.property.mapper.PropertyCompanyDistrictMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="propertyCompanyDistrictResultMap" type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
+ <resultMap id="propertyCompanyDistrictResultMap"
+ type="org.springblade.modules.property.entity.PropertyCompanyDistrictEntity">
<result column="id" property="id"/>
<result column="property_company_id" property="propertyCompanyId"/>
<result column="district_id" property="districtId"/>
@@ -24,7 +25,8 @@
</resultMap>
<!--自定义分页查询-->
- <select id="selectPropertyCompanyDistrictPage" resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
+ <select id="selectPropertyCompanyDistrictPage"
+ resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
select
jpcd.*,
jd.name as districtName,
@@ -51,6 +53,27 @@
<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">
+ SELECT
+ bu.*,
+ jpc.name distictName
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id
+ LEFT JOIN jczz_property_company_district jpcd ON jpdu.property_company_district_id = jpcd.id
+ LEFT JOIN jczz_property_company jpc on jpc.id = jpcd.property_company_id
+ 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} and bu.is_deleted = 0
</select>
--
Gitblit v1.9.3