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/grid/mapper/GridMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index a584db6..45fb583 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -82,8 +82,7 @@
             bu.phone AS gridPhone
         FROM
             jczz_grid jg
-                LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
-                LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+                LEFT JOIN jczz_gridman jgm on jg.grid_code = jgm.grid_code
                 LEFT JOIN blade_region br on br.code = jg.community_code
                 LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, br.name )> 0
                 AND locate( jpr.grid_name, jg.grid_name )> 0

--
Gitblit v1.9.3