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 25afa314fa..09727f5e56 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
@@ -453,6 +453,9 @@ public class AccessServiceImpl implements AccessService {
         }
 
         CustomerAgencyDTO belongAgency = belongAgencyRst.getData();
+        if (belongAgency == null || belongAgency.getId() == null) {
+            throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，用户所属的组织信息不存在");
+        }
 
         //Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
         //if (!agencyByStaffRst.success()) {
@@ -467,11 +470,15 @@ public class AccessServiceImpl implements AccessService {
 
         // 2.拿到当前所处机关单位信息
         Result<CustomerAgencyDTO> currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId);
-        CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
-        if (!currAgencyRst.success() || currAgencyDto == null) {
+        if (!currAgencyRst.success()) {
             throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg()));
         }
 
+        CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
+        if (currAgencyDto == null || currAgencyDto.getId() == null) {
+            throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
+        }
+
         // 获取机关单位中的角色
         // 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里
         //List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());