From e8455bcc0efa8909652adc0cf6a7dd7387f42617 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 27 Jan 2024 15:37:52 +0800
Subject: [PATCH] 新增场所检查，民警扫码查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 186bd7c..9c737c8 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
@@ -796,7 +796,7 @@
@Transactional(rollbackFor = Exception.class)
public Object placeDataHandle() {
// 查询所有的地址表和场所表差集集合
- List<DoorplateAddressEntity> list = baseMapper.getPlaceList();
+ List<DoorplateAddressEntity> list = baseMapper.getNotInPlaceList();
// 创建场所集合对象
List<PlaceEntity> placeList = new ArrayList<>();
if (list.size() > 0) {
@@ -846,14 +846,15 @@
one.setIsJur(1);
}
} else if (doorplateAddress.getRoleName().equals("民警")) {
+ // 无权限
+ one.setIsJur(2);
// 查询对应的社区code
list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
- boolean contains = list.contains(doorplateAddress.getNeiCode().replaceAll("0+$", ""));
- if (list.size() == 0 || !contains) {
- // 无权限
- one.setIsJur(2);
- } else {
- one.setIsJur(1);
+ if (null!=list && list.size()>0){
+ boolean contains = list.contains(one.getNeiCode());
+ if (contains) {
+ one.setIsJur(1);
+ }
}
} else {
// 不限制
@@ -893,4 +894,15 @@
}
return null;
}
+
+ /**
+ * 查询场所标准地址数据
+ * @param doorplateAddressVO
+ * @param size
+ * @return
+ */
+ @Override
+ public Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size) {
+ return baseMapper.getPlaceList(doorplateAddressVO,size);
+ }
}
--
Gitblit v1.9.3