From 342e1ddc1136e22952c1420f93c0baa85df552ad Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 11:01:57 +0800
Subject: [PATCH] 社区，小区，网格查询修改，报事报修，物业申请数据过滤
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 ffe17f8..d5aebd2 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -5,23 +5,31 @@
<!--自定义分页查询-->
<select id="selectGridPage" resultType="org.springblade.modules.grid.vo.GridVO">
select
- id,community_code,grid_name,principal,principal_phone,remark
- from jczz_grid
- where is_deleted = 0
+ jg.id,jg.community_code,jg.grid_name,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
+ where jg.is_deleted = 0
<if test="grid.communityCode!=null and grid.communityCode!=''">
- and community_code = #{grid.communityCode}
+ and jg.community_code = #{grid.communityCode}
</if>
<if test="grid.gridName!=null and grid.gridName!=''">
- and grid_name like concat('%',#{grid.gridName},'%')
+ and jg.grid_name like concat('%',#{grid.gridName},'%')
</if>
<if test="grid.principal!=null and grid.principal!=''">
- and principal like concat('%',#{grid.principal},'%')
+ and jg.principal like concat('%',#{grid.principal},'%')
</if>
<if test="grid.principalPhone!=null and grid.principalPhone!=''">
- and principal_phone like concat('%',#{grid.principalPhone},'%')
+ and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
</if>
<if test="grid.regionCode != null and grid.regionCode !='' ">
- and community_code like concat('%',#{grid.regionCode},'%')
+ and jg.community_code like concat('%',#{grid.regionCode},'%')
+ </if>
+ <if test="grid.communityName != null and grid.communityName !='' ">
+ and br.name like concat('%',#{grid.communityName},'%')
+ </if>
+ <if test="grid.townName != null and grid.townName !='' ">
+ and br.town_name like concat('%',#{grid.townName},'%')
</if>
</select>
--
Gitblit v1.9.3