From ce96649e79bf730aef73f3bec205c1c00a743635 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 22:08:01 +0800
Subject: [PATCH] 修改bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 f8d1e83..0e2371b 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
@@ -129,8 +129,11 @@
 
     @Override
 	@Transactional(rollbackFor = Exception.class)
-	public void importEmpWorkExperience(List<List<Object>> listObject) {
+	public void importEmpWorkExperience(List<List<Object>> listObject,List<String>  returnList) {
 		for (List<Object> list : listObject) {
+            if (list.size()==0){
+                continue;
+            }
 			EmpWorkExperience workExperience = new EmpWorkExperience();
 			workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
 			workExperience.setEmpNumb(list.get(0).toString());
@@ -142,10 +145,10 @@
 				workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
 			}
 			if (StringUtils.isNotBlank(list.get(6).toString())) {
-				workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+				workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
 			}
 			workExperience.setJobContent(list.get(7).toString());
 			this.save(workExperience);
 		}
 	}
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0