From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 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 41466b7..ce07dc3 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -5,7 +5,13 @@
<!--自定义分页查询-->
<select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
select
- jg.id,jg.community_code,jg.grid_name,jg.principal,jg.principal_phone,jg.remark,
+ jg.id,
+ jg.community_code,
+ jg.grid_name,
+ jg.grid_code,
+ jg.principal,
+ jg.principal_phone,
+ jg.remark,
br.name as communityName,br.town_name as townName
from jczz_grid jg
left join blade_region br on br.code = jg.community_code
@@ -18,6 +24,9 @@
</if>
<if test="grid.principal!=null and grid.principal!=''">
and jg.principal like concat('%',#{grid.principal},'%')
+ </if>
+ <if test="grid.gridCode!=null and grid.gridCode!=''">
+ and jg.grid_code like concat('%',#{grid.gridCode},'%')
</if>
<if test="grid.principalPhone!=null and grid.principalPhone!=''">
and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
@@ -65,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>
<!--判断该小区点在哪个派出所-->
@@ -192,4 +204,12 @@
and br.name = #{communityName}
</select>
+ <!--查询用户对应的网格-->
+ <select id="getGridListByUserId" resultType="java.lang.String">
+ select jg.grid_code from jczz_grid jg
+ left join jczz_gridman jgm on jgm.grid_code = jg.grid_code and jgm.is_deleted = 0
+ where jg.is_deleted = 0
+ and jgm.user_id = #{userId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3