From 0eb627e6ce15f62b0b33e1ccac12d98d2146efd8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 17:59:13 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index 018a914..e1ac3d9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -168,21 +168,17 @@
if (list.size()==0){
continue;
}
- Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ EmpBaseInfo empId = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
if (null == empId){
returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(4).toString())).findFirst().orElse(null);
- if (null == dept) {
- returnList.add(StrUtil.format("员工工作经历: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(4).toString()));
- continue;
- }
EmpWorkExperience workExperience = new EmpWorkExperience();
- workExperience.setEmpId(empId);
+ workExperience.setEmpId(empId.getEmpId());
+ //工作经历中的部门
workExperience.setDeptName(list.get(4).toString());
- workExperience.setDeptId(dept.getDeptId());
+ //实际部门ID
+ workExperience.setDeptId(empId.getDeptId());
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
workExperience.setEmpName(list.get(1).toString());
--
Gitblit v1.8.0