From 6ca0f85f69b5a3d52d7d9cd755e032ae338f5a60 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 07 六月 2024 05:52:02 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index 62809ee..d46cf7a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -63,8 +63,15 @@
}
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
+ queryWrapper.like("c.allDeptName", empDimissionlog.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
+ queryWrapper.like("b.empName", empDimissionlog.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
+ queryWrapper.like("b.empNumb", empDimissionlog.getEmpNumb());
}
Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
--
Gitblit v1.8.0