From cc7cf95fb3ca75584153d4f38ff4c2bc6ff7bb8f Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 26 May 2020 09:14:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/AccessServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java index 5a11175b94..8c7e448f64 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java @@ -497,11 +497,12 @@ public class AccessServiceImpl implements AccessService { Set filtedOps = new HashSet<>(); - roleIdList.forEach(roleId -> { - List opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleId); - filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO)); - }); - + if (!CollectionUtils.isEmpty(roleIdList)) { + roleIdList.forEach(roleId -> { + List opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleId); + filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO)); + }); + } return filtedOps; }