Merge branch 'dev_staff_transfer' into dev_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -143,11 +143,12 @@ public class StaffController {
 	 * @author zhaoqifeng
 	 * @date 2020/8/27 16:12
 	 * @param tokenDto
-	 * @param fromDTO
+	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
 	@PostMapping("stafftransfer")
-	public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO fromDTO){
+	public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO formDTO){
+		staffService.staffTransfer(tokenDto, formDTO);
 		return new Result();
 	}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -238,7 +238,10 @@ public class StaffServiceImpl implements StaffService {
 		StaffRoleDTO staffRoleDTO = new StaffRoleDTO();
 		staffRoleDTO.setOrgId(fromDTO.getAgencyId());
 		staffRoleDTO.setStaffId(fromDTO.getStaffId());
-		epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
+		Result result = epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
+		if (!result.success()) {
+			throw new RenException(result.getCode(), result.getMsg());
+		}
 		//7.操作记录表新增调动记录
 		StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO();
 		staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId());