From 526dbcc8dc168afad762346e24a77122db439f78 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 05 Feb 2024 22:17:30 +0800
Subject: [PATCH] 社区街道过滤调整
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index b7f2a0d..e9f9044 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -54,6 +54,7 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,6 +106,9 @@
@Autowired
private ICommunityService communityService;
+ @Autowired
+ private IPoliceAffairsGridService policeAffairsGridService;
+
@Override
public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -125,21 +129,21 @@
houseParam.setUserId(userId);
List<String> stringList = new ArrayList<>();
List<String> communityList = new ArrayList<>();
- if (null != roleName && !roleName.equals("")) {
- houseParam.setRoleName(roleName);
- if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
- // 查询对应的房屋地址code
- stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- if (roleName.equals("民警")) {
- // 查询对应的社区编号
- communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
- }
- }
List<TreeStringNode> list = new ArrayList<>();
if (null != type) {
// 如果是网格管理员，系统管理员,民警
if (type == 1) {
+ if (null != roleName && !roleName.equals("")) {
+ houseParam.setRoleName(roleName);
+ if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
+ // 查询对应的网格code
+ stringList = gridService.getGridListByUserId(AuthUtil.getUserId());
+ }
+ if (roleName.equals("民警")) {
+ // 查询对应的社区编号
+ communityList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
// 查询街道
List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
// 查询社区
@@ -888,7 +892,7 @@
// 无权限
one.setIsJur(2);
// 查询对应的社区code
- list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
if (null!=list && list.size()>0){
boolean contains = list.contains(one.getNeiCode());
if (contains) {
--
Gitblit v1.9.3