From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 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..981f7ee 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,41 @@
<!--自定义分页查询-->
<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},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
+ </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>
@@ -58,15 +76,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
@@ -95,7 +114,7 @@
parent_code as parentId,
name
FROM blade_region
- where district_code = '361102'
+ where district_code = '361102000000'
union all
(select id,
community_code as parentId,
--
Gitblit v1.9.3