From d0e27ecff97fff5fabed2696c9813c8e17ac6322 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 Nov 2023 17:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index 91b1c83..ed612c5 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -19,9 +19,16 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
- <select id="selectDistrictPage" resultMap="districtResultMap">
- select * from jczz_district where is_deleted = 0
+ <!--自定义分页-->
+ <select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
+ select * from jczz_district
+ where is_deleted = 0
+ <if test="district.name !=null and district.name !=''">
+ and name like concat('%',#{district.name},'%')
+ </if>
+ <if test="district.communityCode !=null and district.communityCode !=''">
+ and community_code = #{district.communityCode}
+ </if>
</select>
--
Gitblit v1.9.3