From 6343cac51e460280c721c9db0238b62389146590 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 00:56:46 +0800
Subject: [PATCH] 权限与导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index de8f910..c163d46 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+import cn.hutool.core.util.StrUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -142,14 +143,20 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
dimissionAttend.setEmpNumb(list.get(0).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
- .getDeptId();
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
+ continue;
+ }
dimissionAttend.setDeptName(list.get(1).toString());
- dimissionAttend.setDeptId(deptId);
+ dimissionAttend.setDeptId(dept.getDeptId());
dimissionAttend.setJobName(list.get(2).toString());
dimissionAttend.setEmpName(list.get(3).toString());
dimissionAttend.setCertificateNumb(list.get(4).toString());
--
Gitblit v1.8.0