From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..c10d128 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -66,15 +66,16 @@
         SELECT
             jg.id,
             jg.grid_name,
-            jg.community_name,
-            sort,
+            br.name as community_name,
+            jg.sort,
             bu.real_name AS realName,
             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_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