From 53948833d2e447b83fac7de61005af86fc3fe270 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 01 Jul 2024 10:45:29 +0800
Subject: [PATCH] 九小场所导出新增所属社区
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 b196938..9f14392 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
@@ -31,7 +31,6 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.modules.backblast.entity.BackblastPubRecordEntity;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
@@ -46,7 +45,6 @@
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
-import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
@@ -66,10 +64,8 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceService;
-import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
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;
import org.springframework.stereotype.Service;
@@ -150,10 +146,8 @@
String roleName = SpringUtils.getRequestParam("roleName");
if (!Strings.isBlank(roleName)) {
// 如果是网格管理员，系统管理员,民警,无诈场所采集
- if (roleName.equals("admin") ||
- roleName.equals("wzcj") ||
- roleName.equals("wgy") ||
- roleName.equals("mj")) {
+ if (roleName.equals("admin") || roleName.equals("wzcj") ||
+ roleName.equals("wgy") || roleName.equals("mj")) {
houseParam.setRoleName(roleName);
if ((roleName.equals("wgy") || roleName.equals("wzcj"))
&& !userId.equals("1726859808689696770")) {
@@ -169,6 +163,10 @@
List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
// 查询社区
List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
+ // 查询网格
+ if (stringList.size() > 0) {
+ List<GridEntity> list1 = gridService.list(Wrappers.<GridEntity>lambdaQuery().in(GridEntity::getGridCode, stringList));
+ }
// 遍历
for (TreeStringNode treeNode : townList) {
// 遍历
@@ -1040,7 +1038,9 @@
// 查询对应的社区code
list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
if (null != list && list.size() > 0) {
- boolean contains = list.contains(doorplateAddressVO.getNeiCode());
+ // 存在一个社区有多个派出所，所以社区有36110200201702 存后面添加两位，对比的时候要删除后面两位
+ List<String> collect = list.stream().map(s -> s.length() > 12 ? s.substring(0, s.length() - 2) : s).collect(Collectors.toList());
+ boolean contains = collect.contains(doorplateAddressVO.getNeiCode());
if (contains) {
doorplateAddressVO.setIsJur(1);
}
--
Gitblit v1.9.3