From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 6 +++++-
1 files changed, 5 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 203853c..95a243c 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -74,6 +74,9 @@
left join jczz_gridman jgm on jgm.grid_id = jg.id and jgm.is_deleted = 0
where 1=1
and jgm.user_id = #{userId}
+ <if test="addressCode!=null and addressCode!=''">
+ and jgr.house_code = #{addressCode}
+ </if>
</select>
<!--判断该小区点在哪个派出所-->
@@ -85,6 +88,7 @@
<select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
SELECT
jg.id,
+ jg.grid_code,
jg.grid_name,
br.name as community_name,
jg.sort,
@@ -107,7 +111,7 @@
<!--自定义详情查询-->
<select id="getGridDetail" resultType="org.springblade.modules.grid.vo.GridVO">
- select id,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
+ select id,grid_code,community_code,grid_name,principal,principal_phone,remark,sort from jczz_grid
where is_deleted = 0 and id = #{grid.id}
</select>
--
Gitblit v1.9.3