From 67255cb08c9038ffc960f91da5171cffbbe794a5 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 00:58:18 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 f6a175e..840a5e8 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
@@ -232,12 +232,11 @@
@Override
public boolean verifyEmpNumb(EmpBaseInfo empBaseInfo) {
QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
- queryWrapper.lambda().eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
- EmpBaseInfo tempEmpBaseInfo = this.getOne(queryWrapper);
- if (tempEmpBaseInfo == null) {
+ queryWrapper.lambda().eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb()).ne(EmpBaseInfo::getDelFlag,1);
+ if (this.count(queryWrapper)<=0) {
return false;
}
- return !empBaseInfo.getEmpNumb().equals(tempEmpBaseInfo.getEmpNumb());
+ return true;
}
@Override
@@ -863,4 +862,15 @@
}
return queryWrapper;
}
+
+ @Override
+ public EmpBaseInfo addInEmpBaseInfo(EmpBaseInfo empBaseInfo) {
+ EmpBaseInfo dbEmpInfo = this.getEmpBaseInfo(empBaseInfo);
+ if(dbEmpInfo==null){
+ this.createEmpBaseInfo(empBaseInfo);
+ return null;
+ } else {
+ return dbEmpInfo;
+ }
+ }
}
--
Gitblit v1.8.0