From eb75ecc4eacb90f786ddf2e64c00547496345eeb Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 14:41:58 +0800
Subject: [PATCH] 提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index ae20fb3..a4f034d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -845,6 +845,12 @@
} else {
queryWrapper.in("a.EmpStatus", 0);
}
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
+ queryWrapper.in("a.empCardStatus", empBaseInfo.getEmpCardStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
+ queryWrapper.in("a.handBookStatus", empBaseInfo.getHandbookStatus().split(","));
+ }
// 下面的条件就是人员的属性条件，条件之间是或的关系
if (this.checkQueryCondition(empBaseInfo)) {
queryWrapper.and(p -> {
@@ -852,13 +858,13 @@
p.like("a.EmpNumb", empBaseInfo.getEmpNumb());
}
if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
- p.like("a.EmpName", empBaseInfo.getEmpName());
+ p.or().like("a.EmpName", empBaseInfo.getEmpName());
}
if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
- p.like("a.DeptName", empBaseInfo.getDeptName());
+ p.or().like("a.DeptName", empBaseInfo.getDeptName());
}
if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
- p.like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
+ p.or().like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
p.between("a.EntryDate", empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);
--
Gitblit v1.8.0