From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 8354443..d200107 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -15,6 +15,7 @@
<select id="selectPlacePage" resultType="org.springblade.modules.place.vo.PlaceVO">
select
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,
@@ -96,7 +97,7 @@
<if test="place.regionCode != null and place.regionCode !='' ">
and jg.community_code like concat('%',#{place.regionCode},'%')
</if>
- order by jpe.create_time desc
+ order by jp.create_time desc,jp.id desc
</select>
<!--查询场所集合信息-->
@@ -189,4 +190,13 @@
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
where jp.is_deleted = 0 and jp.principal_user_id is not null
</select>
+
+ <!--查询所有的场所数据（除去详情表已有的）-->
+ <select id="getPlaceListByNoExt" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select
+ jp.*
+ from jczz_place jp
+ LEFT JOIN jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
+ where jp.is_deleted = 0 and jpe.id is null
+ </select>
</mapper>
--
Gitblit v1.9.3