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/PlaceExtMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 2dd3b8c..3b8ae9c 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -4,7 +4,15 @@
 
     <!--自定义分页查询-->
     <select id="selectPlaceExtPage" resultType="org.springblade.modules.place.vo.PlaceExtVO">
-        select * from jczz_place_ext where is_deleted = 0
+        select jpe.*,jp.place_name as placeName from jczz_place_ext jpe
+        left join jczz_place jp on jpe.place_id = jp.id and jp.is_deleted = 0
+        where jpe.is_deleted = 0
+        <if test="placeExt.placeName != null and placeExt.placeName != ''">
+            and jp.place_name like concat('%',#{placeExt.placeName},'%')
+        </if>
+        <if test="placeExt.confirmFlag != null">
+            and jpe.confirm_flag = #{placeExt.confirmFlag}
+        </if>
     </select>
 
 

--
Gitblit v1.9.3