Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -439,6 +439,7 @@ public class AccessServiceImpl implements AccessService {
 
     @Override
     public Set<String> listOperationPermissions(String staffId, String currAgencyId) {
+        Set<String> filtedOps = new HashSet<>();
 
         LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
         if (userDetails == null) {
@@ -476,7 +477,9 @@ public class AccessServiceImpl implements AccessService {
 
         CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
         if (currAgencyDto == null || currAgencyDto.getId() == null) {
-            throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
+            logger.warn(String.format("根据组织ID:{}未找到组织信息，返回空权限列表", currAgencyId));
+            return filtedOps;
+            //throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
         }
 
         // 获取机关单位中的角色
@@ -489,8 +492,6 @@ public class AccessServiceImpl implements AccessService {
         String currOrgIdPath = getOrgIdPath(currAgencyDto);
         String currOrgRelation = getCurrOrgRelation(belongOrgIdPath, currOrgIdPath);
 
-        Set<String> filtedOps = new HashSet<>();
-
         if (!CollectionUtils.isEmpty(roleList)) {
             roleList.forEach(role -> {
                 List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(role.getId());