From b2dee2f787cb8e27417373d0a31ad39501017782 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 二月 2022 09:21:29 +0800
Subject: [PATCH] fix(bug修复): 信息录入模块录入基本信息时的入职类型默认设置成新入职
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 cf6d079..91ba8cc 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
@@ -65,7 +65,7 @@
queryWrapper.like("b.certificateNumb", empJobchange.getCertificateNumb());
}
if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
- queryWrapper.like("a.newDeptName", empJobchange.getDeptName());
+ queryWrapper.like("c.allDeptName", empJobchange.getDeptName());
}
if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
queryWrapper.between("a.changeDate", empJobchange.getChangeDateStr().split(",")[0], empJobchange.getChangeDateStr().split(",")[1]);
@@ -77,7 +77,7 @@
queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
}
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