From 8ffc890fc924361a60f58ad78a2e0aa46e8ccfc0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Oct 2022 18:38:57 +0800
Subject: [PATCH] =?UTF-8?q?/data/aggregator/org/staffdetailv2=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=8A=A5=E9=94=99=E3=80=82=E8=BF=94=E5=9B=9EcustomerI?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java      | 1 +
 .../service/epmetuser/impl/EpmetUserServiceImpl.java         | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
index 2a320915e8..ea1763af18 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java
@@ -46,5 +46,6 @@ public class StaffDetailV2FormDTO implements Serializable {
      * 数字社区里的角色名称
      */
     private List<String> szsqRoles;
+    private String customerId;
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index e89800fa69..7f2fa0e263 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -7,6 +7,8 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IdAndNameDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -720,7 +722,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //基本信息
         CustomerStaffDTO dto = customerStaffDao.selectByStaffId(staffId);
         if (null == dto) {
-            return result;
+            // return result;
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"customer_staff is null staffId:"+staffId,"未查询到工作人员基础信息");
         }
         //角色信息
         List<String> list = staffRoleDao.selectByStaffId(staffId);