From 463f76d8fd91a13099ff676640aee4d9f60f756a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 26 Feb 2024 13:11:30 +0800
Subject: [PATCH] 物业bug修复
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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 d1ed391..6dc4e83 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -36,8 +36,8 @@
jg.grid_name
FROM
jczz_property_company_district jpcd
- LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id AND jd.is_deleted = 0
- LEFT JOIN jczz_property_company jpc ON jpc.id = jpcd.property_company_id AND jpc.is_deleted = 0
+ LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id AND jd.is_deleted = 0
+ LEFT JOIN jczz_property_company jpc ON jpc.id = jpcd.property_company_id AND jpc.is_deleted = 0
LEFT JOIN jczz_community jc on jc.`code`=jd.community_code
LEFT JOIN blade_region br on br.code= jd.community_code
LEFT JOIN jczz_grid_range jgr on jgr.district_code=jd.id
@@ -65,6 +65,9 @@
<if test="propertyCompanyDistrict.propertyStage!=null">
and jpcd.property_stage = #{propertyCompanyDistrict.propertyStage}
</if>
+ <if test="propertyCompanyDistrict.deptId!=null and propertyCompanyDistrict.deptId != ''">
+ and jpc.dept_id = #{propertyCompanyDistrict.deptId}
+ </if>
<if test="propertyCompanyDistrict.principal!=null and propertyCompanyDistrict.principal!=''">
and jpcd.principal like concat('%',#{propertyCompanyDistrict.principal},'%')
</if>
@@ -83,18 +86,16 @@
</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 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