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; }