From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index 93f16fd..494fa55 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -88,7 +88,9 @@
queryWrapper.like("a.Conclusion", empPhysicalexam.getConclusion());
}
if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
- queryWrapper.eq("a.EmpStatus", empPhysicalexam.getEmpStatus());
+ queryWrapper.in("a.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("a.EmpStatus", 0);
}
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
--
Gitblit v1.8.0