From 342f93077bb16a495076fe09133a4f6942102635 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Oct 2022 15:51:21 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/staff/rolelist=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/StaffServiceImpl.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 417cce8a29..8eed306d5b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -126,10 +126,20 @@ public class StaffServiceImpl implements StaffService {
 		return epmetUserFeignClient.getStaffList(fromDTO);
 	}
 
+    /**
+	 * 人员添加页面初始化
+     * 备注：2022.10.18运营端-统一认证也会调用此接口，入参会给customerId
+     * @param fromDTO 参数
+     * @return
+     */
 	@Override
 	public Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
-		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
-		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+		if(StringUtils.isBlank(fromDTO.getCustomerId())){
+			if(StringUtils.isNotBlank(fromDTO.getAgencyId())){
+				CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
+				fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+			}
+		}
 		return epmetUserFeignClient.addStaffInit(fromDTO);
 	}