From f213e5a87147de99afedf92fe78086c1aaa6d3c1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 20 Dec 2023 18:23:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 986b4d3..a08c6f3 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -5,7 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="districtResultMap" type="org.springblade.modules.district.entity.DistrictEntity">
<result column="id" property="id"/>
- <result column="aoi_cdoe" property="aoiCdoe"/>
+ <result column="aoi_code" property="aoiCode"/>
<result column="community_code" property="communityCode"/>
<result column="name" property="name"/>
<result column="address" property="address"/>
@@ -21,13 +21,17 @@
<!--自定义分页-->
<select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
- select * from jczz_district
- where is_deleted = 0
+ select
+ jd.*,
+ br.village_name as communityName,br.town_name as townStreetName
+ from jczz_district jd
+ left join blade_region br on br.code = jd.community_code
+ where jd.is_deleted = 0
<if test="district.name !=null and district.name !=''">
- and name like concat('%',#{district.name},'%')
+ and jd.name like concat('%',#{district.name},'%')
</if>
<if test="district.communityCode !=null and district.communityCode !=''">
- and community_code = #{district.communityCode}
+ and jd.community_code = #{district.communityCode}
</if>
</select>
--
Gitblit v1.9.3