From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 60ff672..adb701b 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
@@ -225,7 +225,7 @@
list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
- placeNode.setName("场所");
+ placeNode.setName("经营场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
@@ -973,9 +973,10 @@
if (null != doorplateAddressVO) {
// 不限制
doorplateAddressVO.setIsJur(1);
- if (!Strings.isBlank(doorplateAddress.getRoleName())) {
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
// 判断是否有权限
- if (doorplateAddress.getRoleName().equals("网格员")) {
+ if (roleName.equals("wgy")) {
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),doorplateAddress.getAddressCode());
if (list.size() == 0) {
// 无权限
@@ -983,11 +984,11 @@
} else {
doorplateAddressVO.setIsJur(1);
}
- } else if (doorplateAddress.getRoleName().equals("民警")) {
+ } else if (roleName.equals("mj")) {
// 无权限
doorplateAddressVO.setIsJur(2);
// 查询对应的社区code
- list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ list = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
if (null != list && list.size() > 0) {
boolean contains = list.contains(doorplateAddressVO.getNeiCode());
if (contains) {
--
Gitblit v1.9.3