From 5c41dbd69af096235e0392356f05ebc028fe4ee4 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 16 四月 2021 14:45:25 +0800
Subject: [PATCH] 合同期限修改为浮点型
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index f96a5d6..729ad67 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -75,11 +75,9 @@
}
if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
}
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "changeDate", FebsConstant.ORDER_ASC, true);
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
IPage<Map<String,Object>> iPage = this.baseMapper.selectPageVo(page, queryWrapper);
List<Map<String,Object>> list =iPage.getRecords();
--
Gitblit v1.8.0