Commit d37ebcce authored by fangxinjiang's avatar fangxinjiang

批量更新历史BUG修复-fxj

parent 96968703
...@@ -1127,8 +1127,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1127,8 +1127,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行身份证号为空!")); errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行身份证号为空!"));
} else { } else {
if (idCardMap.get(idCard) != null) { if (idCardMap.get(idCard) != null) {
errorMsg.add("第" + (i + 2) + "行身份证号与第" + idCardMap.get(idCard) + "行重复!"); errorMsg.add("第" + (excelVOList.get(i).getRowIndex()) + "行身份证号与第" + idCardMap.get(idCard) + "行重复!");
errorMsgMap.put((i + 2L), new ErrorMessage("第" + (i + 2) + "行身份证号与第" + idCardMap.get(idCard) + "行重复!")); errorMsgMap.put((excelVOList.get(i).getRowIndex().longValue()), new ErrorMessage("第" + (i + 2) + "行身份证号与第" + idCardMap.get(idCard) + "行重复!"));
} else { } else {
idCardMap.put(idCard, i + 2); idCardMap.put(idCard, i + 2);
idCardList.add(idCard); idCardList.add(idCard);
...@@ -1143,7 +1143,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1143,7 +1143,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((excelVOList.get(i).getRowIndex().longValue()), errorMsg));
} }
} }
......
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