From 4e52cb2253af9a22571c7d0c239ee283178d2fd4 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 10:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 42 ------------------------------------------
1 files changed, 0 insertions(+), 42 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 f5a05f8..9df2048 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
@@ -876,48 +876,6 @@
if (StringUtils.isNotBlank(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]);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
- p.between("a.DimissionDate", empBaseInfo.getDimissionDateStr().split(",")[0], empBaseInfo.getDimissionDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
- p.or().in("a.Sex", empBaseInfo.getSex().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
- p.or().in("a.Education", empBaseInfo.getEducation().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
- p.or().in("a.Politics", empBaseInfo.getPolitics().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
- String[] ages = empBaseInfo.getAgeStr().split(",");
- Consumer<QueryWrapper<EmpBaseInfo>> consumer = new Consumer<QueryWrapper<EmpBaseInfo>>() {
- public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
- for (int i = 0; i < ages.length; i++) {
- String ageBtn = ages[i];
- wrapper.or().between("a.Age", ageBtn.split("-")[0], ageBtn.split("-")[1]);
- }
- }
- };
- p.or().and(consumer);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
- p.or().in("a.ArchivesStatus", empBaseInfo.getArchivesStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
- p.or().in("a.InsuranceType", empBaseInfo.getInsuranceType().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
- p.or().in("a.HandbookStatus", empBaseInfo.getHandbookStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
- p.or().in("a.EmpCardStatus", empBaseInfo.getEmpCardStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEmpType())) {
- p.or().in("a.empType", empBaseInfo.getEmpType().split(","));
- }
});
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
--
Gitblit v1.8.0