From bfeab0c9d94480f4e742d311d168c79572b78745 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 08 三月 2021 16:59:02 +0800
Subject: [PATCH] Merge branch '查询条件修改'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index 79ae23b..46b8305 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -94,7 +94,7 @@
queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
}
if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empOccupational.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
--
Gitblit v1.8.0