From b230858cc0d2ee4fdb177c91c4e11cdf3dd57364 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 07:15:33 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 cbdddc2..0e82aed 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
@@ -162,6 +162,7 @@
} else{
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
+ empBaseInfo.setEmpStatus("0");
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
@@ -247,7 +248,7 @@
@Override
public EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo) {
QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
- if(StringUtils.isEmpty(empBaseInfo.getCertificateNumb())){
+ if(StringUtils.isNotEmpty(empBaseInfo.getCertificateNumb())){
queryWrapper.lambda().eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
}
--
Gitblit v1.8.0