From 449d66204c4aed57fca949f2892ed24cdddd18db Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 28 Feb 2024 17:16:22 +0800
Subject: [PATCH] 数据过滤新增公安管理员可以看全部
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 92 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index b016394..31938d0 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -17,18 +17,20 @@
select
jp.*,
jpe.id as placeExtId,
- bu.real_name as username,bu.phone as phone,
- br.town_name as townStreetName,br.name as neiName,
- jpe.confirm_flag confirmFlag,
+ bu.real_name as username,
+ bu.phone as phone,
+ br.town_name as townStreetName,
+ br.name as neiName,
jg.grid_name as gridName,
bus.`name` AS policeName,
- bu.phone AS policePhone
+ bus.phone AS policePhone,
+ jpe.confirm_flag confirmFlag
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
left join jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
left join (
select a.* from jczz_place_poi_label a inner join
@@ -73,22 +75,59 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
<if test="isAdministrator==2">
<choose>
- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
</when>
<otherwise>
- and jg.grid_code in ('')
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or jpag.community_code in ('')
+ )
+ </otherwise>
+ </choose>
</otherwise>
</choose>
</if>
@@ -284,6 +323,7 @@
select
jp.id,
jp.house_code,
+ jp.house_code_binds,
jp.building_code,
jp.principal_user_id,
jp.principal,
@@ -294,7 +334,6 @@
if(jp.source=1,jda.y,jp.lat) as lat,
if(jp.source=1,jda.address_name,jp.location) as location,
jp.image_urls,
- jp.grid_id,
jp.grid_code,
jp.jw_grid_code,
jp.source,
@@ -323,7 +362,12 @@
left join jczz_doorplate_address jda on jda.address_code = jp.house_code
where jp.is_deleted = 0
<if test="place.houseCode!=null and place.houseCode!=''">
- and jp.house_code like concat('%',#{place.houseCode},'%')
+ and
+ (
+ jp.house_code = #{place.houseCode}
+ or
+ jp.house_code_binds like concat('%',#{place.houseCode},'%')
+ )
</if>
<if test="place.id!=null">
and jp.id = #{place.id}
@@ -680,6 +724,7 @@
select id,lng,lat from jczz_place where is_deleted = 0
and source != 3
and jw_grid_code is null
+ and lng != ''
</select>
<!--比对两点间的距离是否在1km 范围内(和地址总表位置对比)-->
@@ -707,4 +752,13 @@
) <= 1
</select>
+
+ <!--查询 综治网格为空的数据-->
+ <select id="getPlaceNotGridCode" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select id,lng,lat from jczz_place where is_deleted = 0
+ and source != 3
+ and grid_code is null
+ and lng != ''
+ </select>
+
</mapper>
--
Gitblit v1.9.3