From ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:05:31 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 2ade707..b12da11 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
@@ -5,6 +5,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.*;
+import java.util.function.Consumer;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.utils.MyUtil;
@@ -100,6 +101,9 @@
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
queryWrapper.like(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics());
}
+ if (StringUtils.isNotBlank(empBaseInfo.getEmpStatus())) {
+ queryWrapper.in(EmpBaseInfo::getEmpStatus, empBaseInfo.getEmpStatus());
+ }
if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
queryWrapper.between(EmpBaseInfo::getAge, empBaseInfo.getAgeStr().split(",")[0], empBaseInfo.getAgeStr().split(",")[1]);
}
@@ -194,13 +198,19 @@
if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
queryWrapper.in(EmpBaseInfo::getPolitics, empBaseInfo.getPolitics().split(","));
}
- if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
- String[] ages=empBaseInfo.getAgeStr().split(",");
- for (int i = 0; i < ages.length; i++) {
- String ageBtn=ages[i];
- queryWrapper.between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
- }
- }
+ if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
+ String[] ages = empBaseInfo.getAgeStr().split(",");
+ Consumer<LambdaQueryWrapper<EmpBaseInfo>> consumer = new Consumer<LambdaQueryWrapper<EmpBaseInfo>>() {
+ @Override
+ public void accept(LambdaQueryWrapper<EmpBaseInfo> wrapper) {
+ for (int i = 0; i < ages.length; i++) {
+ String ageBtn = ages[i];
+ wrapper.or().between(EmpBaseInfo::getAge, ageBtn.split("-")[0], ageBtn.split("-")[1]);
+ }
+ }
+ };
+ queryWrapper.and(consumer);
+ }
if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
queryWrapper.in(EmpBaseInfo::getArchivesStatus, empBaseInfo.getArchivesStatus().split(","));
}
--
Gitblit v1.8.0