From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 6dc4e83..0ee126f 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -31,20 +31,21 @@
jpcd.*,
jd.name as districtName,
jpc.name as propertyCompanyName,
- jc.name communityName,
+ br.name communityName,
br.name streetName,
- jg.grid_name
+ jg.grid_name,
+ bu.name principalName
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_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
LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN blade_user bu on bu.id = jpcd.principal
where jpcd.is_deleted = 0
<if test="propertyCompanyDistrict.communityName!=null and propertyCompanyDistrict.communityName!=''">
- and jc.name like concat('%', #{propertyCompanyDistrict.communityName},'%')
+ and br.name like concat('%', #{propertyCompanyDistrict.communityName},'%')
</if>
<if test="propertyCompanyDistrict.streetName!=null and propertyCompanyDistrict.streetName!=''">
@@ -89,7 +90,7 @@
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_district_user jpdu ON bu.id = jpdu.user_id and bu.is_deleted = 0
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
--
Gitblit v1.9.3