From 890be4f01daefbca6f085bb8314d40de282c1db8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 05 三月 2021 15:52:47 +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 | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 1e55801..ec3c1e4 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
@@ -901,6 +901,9 @@
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));
@@ -927,4 +930,14 @@
}
}
+
+ @Override
+ public EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb) {
+ try {
+ return this.getOne(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getEmpNumb,empNumb).ne(EmpBaseInfo::getDelFlag,1));
+ }catch (Exception e){
+ return null;
+ }
+
+ }
}
--
Gitblit v1.8.0