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/EmpJobChangeServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
index 4ac7777..74833a4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java
@@ -65,6 +65,11 @@
if (StringUtils.isNotBlank(empJobchange.getChangeType())) {
queryWrapper.eq("a.changeType", empJobchange.getChangeType());
}
+ if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("b.EmpStatus", 0);
+ }
Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
return this.baseMapper.selectPageVo(page, queryWrapper);
--
Gitblit v1.8.0