From 18c13ba8900911f41a60df49125b4570b3852e0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 20 六月 2021 18:16:16 +0800
Subject: [PATCH] fix(bug修复): 证件查询从或改为与
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 6f39981..6955b7e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -73,12 +73,15 @@
queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
- queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
+ queryWrapper.in("b.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
}
if (StringUtils.isNotBlank(empLeaveinfo.getLeaveDateStr())) {
queryWrapper.ge("a.BeginTime", empLeaveinfo.getLeaveDateStr().split(",")[0]);
queryWrapper.le("a.EndTime", empLeaveinfo.getLeaveDateStr().split(",")[1]);
}
+ if(StringUtils.isNotBlank(empLeaveinfo.getLeaveType())){
+ queryWrapper.eq("a.leaveType", empLeaveinfo.getLeaveType());
+ }
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);
--
Gitblit v1.8.0