/gov/org/staff/editstaff兼容下运营端

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);
 	}
 
 	/**

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);
 
 	/**
 	 * 人员编辑

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) {
+	public Result editStaff(StaffSubmitFromDTO fromDTO) {
-		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
+		if(StringUtils.isBlank(fromDTO.getCustomerId())){
-		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
+			CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
-
+			fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
-		fromDTO.setApp(tokenDto.getApp());
+		}
-		fromDTO.setClient(tokenDto.getClient());
+		// 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")){
+		// if (tokenDto.getClient().equals("web")){
-			Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId()));
+			if(CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){
-			if (!roleUserAccess.success()){
+				Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId()));
-				throw new EpmetException("save data to gov-role-user failure");
+				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;