From df8e0d32f71c52304b9801f76a07c61192c819a0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Oct 2022 16:25:01 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/staff/editstaff=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8B=E8=BF=90=E8=90=A5=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/StaffController.java |  2 +-
 .../java/com/epmet/service/StaffService.java  |  2 +-
 .../epmet/service/impl/StaffServiceImpl.java  | 31 ++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
index 892f92087b..0463372db2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
@@ -98,7 +98,7 @@ public class StaffController {
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE)
 	public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitFromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO);
-		return staffService.editStaff(tokenDto, fromDTO);
+		return staffService.editStaff(fromDTO);
 	}
 
 	/**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
index 9d9929a9ae..5a4a989166 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
@@ -62,7 +62,7 @@ public interface StaffService {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result editStaff(TokenDto tokenDto,StaffSubmitFromDTO fromDTO);
+	Result editStaff(StaffSubmitFromDTO fromDTO);
 
 	/**
 	 * 人员编辑
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 8eed306d5b..954eb170df 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
@@ -191,13 +191,20 @@ public class StaffServiceImpl implements StaffService {
 		return new Result();
 	}
 
+	/**
+	 *
+	 * @param tokenDto TokenDto tokenDto,
+	 * @param fromDTO
+	 * @return
+	 */
 	@Override
-	public Result editStaff(TokenDto tokenDto, StaffSubmitFromDTO fromDTO) {
-		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
-		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
-
-		fromDTO.setApp(tokenDto.getApp());
-		fromDTO.setClient(tokenDto.getClient());
+	public Result editStaff(StaffSubmitFromDTO fromDTO) {
+		if(StringUtils.isBlank(fromDTO.getCustomerId())){
+			CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
+			fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+		}
+		// fromDTO.setApp(tokenDto.getApp());
+		// fromDTO.setClient(tokenDto.getClient());
 		Result result = epmetUserFeignClient.editStaff(fromDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
@@ -205,12 +212,14 @@ public class StaffServiceImpl implements StaffService {
 			}
 			return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg());
 		}
-		if (tokenDto.getClient().equals("web")){
-			Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId()));
-			if (!roleUserAccess.success()){
-				throw new EpmetException("save data to gov-role-user failure");
+		// if (tokenDto.getClient().equals("web")){
+			if(CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){
+				Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId()));
+				if (!roleUserAccess.success()){
+					throw new EpmetException("save data to gov-role-user failure");
+				}
 			}
-		}
+		// }
 		//2021.8.24 sun 人员信息编辑时删除工作人员的缓存信息
 		CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId());
 		return result;