From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 3d1062e..96c2113 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -33,6 +33,7 @@
) b on a.id = b.id
) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jp.source!=3
+ and jp.place_name != ''
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
</if>
@@ -43,7 +44,7 @@
and jp.principal_phone like concat('%',#{place.principalPhone},'%')
</if>
<if test="place.houseCode!=null and place.houseCode!=''">
- and jp.house_code = #{place.houseCode}
+ and jp.house_code like concat('%',#{place.houseCode},'%')
</if>
<if test="place.townStreetName!=null and place.townStreetName!=''">
and br.town_name like concat('%',#{place.townStreetName},'%')
@@ -63,16 +64,22 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
+ <if test="houseCodeList != null and houseCodeList.size()>0">
+ and jp.house_code in
+ <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </if>
<if test="isAdministrator==2">
<choose>
<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.community_code in
+ and jg.grid_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
</when>
<otherwise>
- and jg.community_code in ('')
+ and jg.grid_code in ('')
</otherwise>
</choose>
</if>
@@ -84,11 +91,11 @@
SELECT jp.id,
jp.house_code houseCode,
jp.place_name AS NAME,
+ jp.is_nine AS isNine,
br.name neiName,
FALSE AS hasChildren
FROM jczz_place jp
- LEFT JOIN jczz_grid_range jgr ON jp.house_code = jgr.house_code
- LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
LEFT JOIN blade_region br on br.code = jg.community_code
where 1 = 1
and jp.is_deleted = 0
@@ -140,7 +147,7 @@
left join blade_region br on br.code = jg.community_code
where jp.is_deleted = 0
<if test="place.houseCode!=null and place.houseCode!=''">
- and jp.house_code = #{place.houseCode}
+ and jp.house_code like concat('%',#{place.houseCode},'%')
</if>
<if test="place.id!=null">
and jp.id = #{place.id}
--
Gitblit v1.9.3