From 1b39b59699b8209e243ce151e5493b0b25f36ecb Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 三月 2021 13:27:53 +0800
Subject: [PATCH] fix(bug修复): 附件与在职员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 6ae1990..0b16cbf 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
@@ -69,9 +69,15 @@
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empWorkexperience.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("a.EmpStatus", 0);
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
--
Gitblit v1.8.0