diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index d2ee934888..7265e9bcae 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -504,8 +504,9 @@ public class GovOrgServiceImpl implements GovOrgService {
     public StaffDetailV2FormDTO staffDetailV2(StaffDetailV2ResultDTO formDTO) {
         //1.查询工作人员基本信息、角色信息
         StaffDetailV2FormDTO result = epmetUserService.selectByStaffId(formDTO.getStaffId());
-        if (null == result) {
-            return new StaffDetailV2FormDTO();
+        if (null == result||StringUtils.isBlank(result.getStaffId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+formDTO.getStaffId(),"未查询到工作人员基本信息");
+            // return new StaffDetailV2FormDTO();
         }
 
         //2.查询工作人员注册组织关系信息
@@ -513,7 +514,7 @@ public class GovOrgServiceImpl implements GovOrgService {
         staffIdList.add(formDTO.getStaffId());
         List<StaffOrgNameResultDTO> list = customerAgencyDao.selelctStaffOrg(staffIdList);
         if (null == list || list.size() < NumConstant.ONE) {
-            throw new RenException("未查询到工作人员注册组织信息");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"未查询到工作人员注册组织信息","未查询到工作人员所属组织信息");
         }
 
         //3.封装数据并返回