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 10499f4b52..3cf98078f5 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
@@ -766,6 +766,9 @@ public class AgencyServiceImpl implements AgencyService {
         }
         if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) {
             CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId());
+            if (null == entity) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customer_agency is null orgId:" + formDTO.getOrgId(), "组织信息查询为空orgId:" + formDTO.getOrgId());
+            }
             result = ConvertUtils.sourceToTarget(entity, MapOrgResultDTO.class);
             result.setName(entity.getOrganizationName());
             result.setLevel(formDTO.getLevel());