From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 e8d3fda..c4b34e6 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -4,14 +4,37 @@
<!--自定义分页查询-->
<select id="selectPlacePage" resultType="org.springblade.modules.place.vo.PlaceVO">
- select * from jczz_place where is_deleted = 0
+ select jp.*,bu.real_name as username,bu.phone as phone 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
+ where jp.is_deleted = 0
+ <if test="place.placeName!=null and place.placeName!=''">
+ and jp.place_name like concat('%',#{place.placeName},'%')
+ </if>
+ <if test="place.isPerfect==1">
+ and
+ (
+ jp.place_name is null
+ or jp.image_urls is null
+ or jppl.poi_code is not null
+ or bu.real_name is null
+ or bu.phone is null
+ )
+ </if>
+ <if test="place.isPerfect==2">
+ and jp.place_name != ""
+ and jp.image_urls != ""
+ and jppl.poi_code is not null
+ and bu.real_name != ""
+ and bu.phone != ""
+ </if>
</select>
<!--查询场所集合信息-->
<select id="selectPlaceNodeList" resultType="org.springblade.common.node.TreeNode" >
select id,place_name as name,false as hasChildren from jczz_place
- where 1=1
- and principal = #{userId}
+ where 1=1 and is_deleted = 0
+ and principal_user_id = #{userId}
</select>
</mapper>
--
Gitblit v1.9.3