From 00c11e16ac27b31c8d29b3c64afa88082010c33e Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 17 五月 2021 22:37:08 +0800
Subject: [PATCH] 合同信息增加到处备注
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 1fdc44e..d3d5326 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -68,9 +68,13 @@
if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
queryWrapper.like("a.CertificateNumb", empRemarkinfo.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
+ if (StringUtils.isNotBlank(empRemarkinfo.getAllDeptName())) {
+ queryWrapper.like("b.allDeptName", empRemarkinfo.getAllDeptName());
}
+
+ if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
+ queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
+ }
if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
queryWrapper.between("a.RemarkDate", empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
@@ -171,7 +175,7 @@
returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empRemarkinfo.setDelFlag(2);
+ empRemarkinfo.setDelFlag(0);
empRemarkinfo.setEmpId(empId);
empRemarkinfo.setDeptName(list.get(1).toString());
empRemarkinfo.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0