From 593e8339b11f814f14f5160d2b01212ffa39f34b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 11:11:44 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml |    2 +-
 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml    |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
index 073b59d..74362f3 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="org.springblade.modules.property.mapper.PropertyCapitalApplyMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="propertyCapitalApplyResultMap" type="org.springblade.modules.property.entity.PropertyCapitalApplyEntity">
+    <resultMap id="propertyCapitalApplyResultMap"
+               type="org.springblade.modules.property.entity.PropertyCapitalApplyEntity">
         <result column="id" property="id"/>
         <result column="property_company_id" property="propertyCompanyId"/>
         <result column="district_id" property="districtId"/>
@@ -47,9 +48,9 @@
         <if test="propertyCapitalApply.districtName!=null and propertyCapitalApply.districtName!=''">
             and jd.name like concat('%',#{propertyCapitalApply.districtName},'%')
         </if>
-        <if test="propertyCapitalApply.districtIdList!=null and propertyCapitalApply.districtIdList!=''">
+        <if test="propertyCapitalApply.districtIdList!=null and propertyCapitalApply.districtIdList.size()>0">
             and jpca.district_id in
-            <foreach collection="propertyCapitalApply.districtIdList" item="item" separator ="," open="("  close=")">
+            <foreach collection="propertyCapitalApply.districtIdList" item="item" separator="," open="(" close=")">
                 #{item}
             </foreach>
         </if>
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 bdb121a..1daddef 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml
@@ -53,7 +53,7 @@
         <if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
             and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
         </if>
-        <if test="propertyCompanyDistrict.districtIds">
+        <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}

--
Gitblit v1.9.3