From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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>
--
Gitblit v1.9.3