From cb61acd5c6735788b68e1031e85a0dab244f40aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 20 Jan 2024 17:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 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 dd8d62d..3d1062e 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -18,15 +18,13 @@
jp.*,
jpe.id as placeExtId,
bu.real_name as username,bu.phone as phone,
- bx.real_name as createUserName,
br.town_name as townStreetName,br.name as neiName,
- jpe.confirm_flag confirmFlag
+ jpe.confirm_flag confirmFlag,
+ jg.grid_name as gridName
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
- left join blade_user bx on bx.id = jp.create_user and bx.is_deleted = 0
- LEFT JOIN jczz_place_ext jpe on jpe.place_id=jp.id
- left join jczz_grid_range jgr on jgr.house_code = jp.house_code
- left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
+ left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
left join (
select a.* from jczz_place_poi_label a inner join
@@ -35,12 +33,6 @@
) b on a.id = b.id
) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jp.source!=3
- <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="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
</if>
@@ -139,13 +131,12 @@
jppl.color,
jppl.remark as cremark,
jc.category_name as labelName,
- br.code as neiCode,jg.id as gridId
+ br.code as neiCode
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
left join jczz_category jc on jc.category_no = jppl.poi_code
- left join jczz_grid_range jgr on jgr.house_code = jp.house_code
- left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ 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 jp.is_deleted = 0
<if test="place.houseCode!=null and place.houseCode!=''">
--
Gitblit v1.9.3