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/grid/mapper/GridMapper.xml | 5 +++--
1 files changed, 3 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 d5aebd2..3d5b270 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -66,7 +66,7 @@
SELECT
jg.id,
jg.grid_name,
- jg.community_name,
+ br.name as community_name,
sort,
bu.real_name AS realName,
bu.phone AS gridPhone
@@ -74,7 +74,8 @@
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_place_rel jpr ON locate( jpr.community_name, jg.community_name )> 0
+ 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
AND jpr.is_deleted = 0
LEFT JOIN blade_user bu ON bu.id = jgm.user_id
--
Gitblit v1.9.3