From 12ef02a92d7eafd63084c9fa303357040e0f29a1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:09:36 +0800
Subject: [PATCH] fix(bug修复): 汇总bug修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 3018b8c..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
@@ -64,9 +64,15 @@
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
}
- if (StringUtils.isNotBlank(empDimissionlog.getAllDeptName())) {
+ 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);
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
--
Gitblit v1.8.0