From 8bbcf203caac16c26ef879e0d85ceed1c6f061f4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jan 2024 10:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 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 124ed96..d6a1888 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -17,10 +17,8 @@
         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
-        LEFT JOIN jczz_grid_range jgr on jgr.house_code=jp.house_code
-        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+        LEFT JOIN jczz_place jp ON jpe.place_id = jp.id AND jp.is_deleted = 0
+        LEFT JOIN jczz_grid jg ON jp.grid_code = jg.grid_code AND jg.is_deleted = 0
         WHERE
         jpe.is_deleted = 0
         <if test="isAdministrator==2">

--
Gitblit v1.9.3