From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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..04d732d 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!=''">
--
Gitblit v1.9.3