From 57fc705f91f6972b956d92da85e1ab2771709874 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 15:37:57 +0800
Subject: [PATCH] fix(bug修复): 岗位变更显示部门全称
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
index 4a92684..76ec259 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
@@ -54,21 +54,24 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkExperienceService.findEmpWorkExperiences(request, empWorkexperience));
return new FebsResponse().data(dataTable);
}
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpWorkExperience empBaseinfo, HttpServletResponse response) {
empBaseinfo.setDelFlag(0);
+ request.setPageSize(this.empWorkExperienceService.count());
List<EmpWorkExperience> records = this.empWorkExperienceService.findEmpWorkExperiences(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpWorkExperience.class, response).downXlsx(records, false);
}
+
@PostMapping
@PreAuthorize("hasAuthority('empWorkexperience:add')")
public void addEmpWorkExperience(@Valid EmpWorkExperience empWorkexperience) throws FebsException {
try {
this.empWorkExperienceService.createEmpWorkExperience(empWorkexperience);
} catch (Exception e) {
- String message = "新增员工工作经历失败";
+ String message = "新增员工工作经历失败 "+e.getMessage();
log.error(message, e);
throw new FebsException(message);
}
--
Gitblit v1.8.0