diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 9da41f2e2c..48dfc5da3f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -570,6 +570,9 @@ public class AgencyServiceImpl implements AgencyService {
         MapOrgResultDTO result = new MapOrgResultDTO();
         if (StringUtils.isBlank(formDTO.getOrgId())){
             CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            if (null == staffInfo){
+                return result;
+            }
             formDTO.setOrgId(staffInfo.getFromOrgId());
             formDTO.setLevel(staffInfo.getFromOrgType());
         }