From db6a13645ba212dee0ef46548cc3468d30b76873 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 24 五月 2021 21:29:05 +0800
Subject: [PATCH] feat(定时更新基本信息表的部门名称与全称):
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.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/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index 93c29f1..28f3e4f 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
@@ -79,7 +79,7 @@
queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
}
if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
- queryWrapper.like("a.DeptName", empOccupational.getDeptName());
+ queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
}
if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
@@ -210,7 +210,7 @@
returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empOccupational.setDelFlag(2);
+ empOccupational.setDelFlag(0);
empOccupational.setEmpId(empBaseInfo.getEmpId());
empOccupational.setDeptName(list.get(1).toString());
empOccupational.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0