From 5c2fa39e408417cef23de9bb2eb3b776f6b34de6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 15:47:24 +0800
Subject: [PATCH] e户,轮播图,物业公司小区查询修改

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 06f98e1..fdcc0c4 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -25,19 +25,31 @@
 
     <!--自定义分页查询-->
     <select id="selectPropertyCompanyDistrictPage" resultType="org.springblade.modules.property.vo.PropertyCompanyDistrictVO">
-        select * from jczz_property_company_district
-        where is_deleted = 0
+        select
+        jpcd.*,
+        jd.name as districtName,
+        jpc.name as propertyCompanyName
+        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
+        where jpcd.is_deleted = 0
         <if test="propertyCompanyDistrict.propertyCompanyId!=null">
-            and property_company_id = #{propertyCompanyDistrict.propertyCompanyId}
+            and jpcd.property_company_id = #{propertyCompanyDistrict.propertyCompanyId}
         </if>
         <if test="propertyCompanyDistrict.districtId!=null">
-            and district_id = #{propertyCompanyDistrict.districtId}
+            and jpcd.district_id = #{propertyCompanyDistrict.districtId}
         </if>
         <if test="propertyCompanyDistrict.propertyStage!=null">
-            and property_stage = #{propertyCompanyDistrict.propertyStage}
+            and jpcd.property_stage = #{propertyCompanyDistrict.propertyStage}
         </if>
         <if test="propertyCompanyDistrict.principal!=null and propertyCompanyDistrict.principal!=''">
-            and principal like concat('%',#{propertyCompanyDistrict.principal},'%')
+            and jpcd.principal like concat('%',#{propertyCompanyDistrict.principal},'%')
+        </if>
+        <if test="propertyCompanyDistrict.districtName!=null and propertyCompanyDistrict.districtName!=''">
+            and jd.name like concat('%',#{propertyCompanyDistrict.districtName},'%')
+        </if>
+        <if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
+            and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
         </if>
     </select>
 

--
Gitblit v1.9.3