From fda09077e808d21fffa6f0a21aa17801f26060d0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 20:09:35 +0800
Subject: [PATCH] 扫码限制调整
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 bdfb540..b4d15bb 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
@@ -199,23 +199,32 @@
houseNode.setId("1");
houseNode.setHasChildren(true);
houseNode.setChildren(houseNodeList);
+ list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
placeNode.setName("场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
-
- list.add(houseNode);
list.add(placeNode);
// 返回
return list;
}
if (houseNodeList.size()>0){
- list = houseNodeList;
+ TreeStringNode houseNode = new TreeStringNode();
+ houseNode.setName("房屋");
+ houseNode.setId("1");
+ houseNode.setHasChildren(true);
+ houseNode.setChildren(houseNodeList);
+ list.add(houseNode);
}
if (placeNodeList.size()>0){
- list = placeNodeList;
+ TreeStringNode placeNode = new TreeStringNode();
+ placeNode.setName("场所");
+ placeNode.setId("2");
+ placeNode.setHasChildren(true);
+ placeNode.setChildren(placeNodeList);
+ list.add(placeNode);
}
// 返回
return list;
@@ -782,6 +791,8 @@
// 扫码时调用，需判断是否有权限查看
DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
if (null!=one){
+ // 不限制
+ one.setIsJur(1);
if (!Strings.isBlank(doorplateAddress.getRoleName())) {
// 判断是否有权限
if (doorplateAddress.getRoleName().equals("网格员")) {
--
Gitblit v1.9.3