Commit 27b8511a authored by fangxinjiang's avatar fangxinjiang

批量更新历史BUG修复-fxj

parent 4f783f90
...@@ -1804,12 +1804,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1804,12 +1804,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
String areaStr; String areaStr;
// 执行数据插入操作 组装 // 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
excel = excelVOList.get(i);
// 已有验证报错直接下一个 // 已有验证报错直接下一个
if (Common.isNotNull(errorMsgMap.get((i + 2L)))) { if (Common.isNotNull(errorMsgMap.get((excel.getRowIndex())))) {
continue; continue;
} }
errorMsg = new HashSet<>(); errorMsg = new HashSet<>();
excel = excelVOList.get(i);
saveEmp = existEmpMap.get(excel.getEmpIdcard()); saveEmp = existEmpMap.get(excel.getEmpIdcard());
// 档案存在 // 档案存在
if (saveEmp != null) { if (saveEmp != null) {
...@@ -2075,7 +2075,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2075,7 +2075,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 数据合法情况 // 数据合法情况
if (!CollUtil.isEmpty(errorMsg)) { if (!CollUtil.isEmpty(errorMsg)) {
// 数据不合法 // 数据不合法
errorMessageList.add(new ErrorMessage((i + 2L), errorMsg)); errorMessageList.add(new ErrorMessage(excel.getRowIndex().longValue(), errorMsg));
} }
} }
if (CollUtil.isNotEmpty(errorMessageList)) { if (CollUtil.isNotEmpty(errorMessageList)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment