From 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 19056ee..1053ff7 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -28,7 +28,8 @@
bu.real_name as realName,bu.phone as gridPhone
from jczz_grid jg
left join jczz_grid_range jgr on jg.id = jgr.grid_id
- left join blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
+ left join jczz_gridman jgm on jg.id = jgm.grid_id and jgm.is_deleted = 0
+ left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0
where jg.is_deleted = 0
and jgr.house_code = #{houseCode}
</select>
--
Gitblit v1.9.3