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/EmpResignServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index 932c426..35b6d48 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -73,7 +73,7 @@
queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
}
if (StringUtils.isNotBlank(empResign.getDeptName())) {
- queryWrapper.like("a.DeptName", empResign.getDeptName());
+ queryWrapper.like("b.allDeptName", empResign.getDeptName());
}
if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
@@ -85,7 +85,7 @@
queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
return empResignMapper.selectPageVo(page, queryWrapper);
}
@@ -188,7 +188,7 @@
returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- resign.setDelFlag(2);
+ resign.setDelFlag(0);
resign.setEmpId(empId);
resign.setDeptName(list.get(1).toString());
resign.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0