From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
index a2f1895..621581a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
@@ -50,7 +50,6 @@
@ApiOperation(value = "员工调岗记录翻页列表")
@GetMapping("list")
- @PreAuthorize("hasAuthority('empJobchange:list')")
public FebsResponse empJobchangeList(QueryRequest request, EmpJobChange empJobchange) {
Map
<String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
@@ -60,7 +59,7 @@
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpJobChange empBaseinfo, HttpServletResponse response) {
-
+ request.setPageSize(this.empJobchangeService.count());
List<EmpJobChange> records = this.empJobchangeService.findEmpJobChanges(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpJobChange.class, response).downXlsx(records, false);
}
--
Gitblit v1.8.0