From 8bb9cf4117634383f45bc8e2be5c92993e5ef0b6 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index e8fa729..358b468 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -45,16 +45,19 @@
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
- queryWrapper.eq(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
- queryWrapper.eq(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.eq(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
- queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
+ queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
--
Gitblit v1.8.0