From 49a2f509d6a114c062b966a5bab83f45980e808f Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 12 五月 2021 15:30:49 +0800
Subject: [PATCH] fix(bug修复): 入离职记录智搜无法按姓名查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index d239c5a..438c23f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -76,7 +76,7 @@
queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
}
if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
+ queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
}
if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
@@ -177,7 +177,7 @@
returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- leaveInfo.setDelFlag(2);
+ leaveInfo.setDelFlag(0);
leaveInfo.setEmpId(empBaseInfo.getEmpId());
leaveInfo.setDeptName(list.get(1).toString());
leaveInfo.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0