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/PropertyCapitalApplyMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 64d6feb..f383b27 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"/>
@@ -25,6 +26,7 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="article_id" property="articleId"/>
</resultMap>
<!--自定义分页查询-->
@@ -47,14 +49,21 @@
<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>
- <if test="propertyCapitalApply.regionCode != null and propertyCapitalApply.regionCode !='' ">
- and jd.community_code like concat('%',#{propertyCapitalApply.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jd.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ </choose>
</if>
order by jpca.create_time desc
</select>
--
Gitblit v1.9.3