diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index d46c9d98..b4d3d014 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -1687,7 +1687,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ List levelPOS = MapperProxyFactory.getProxy(LevelMapper.class).listByNo(split[index]); if (levelPOS.size() == 0) { historyDetailPO.setRelatedName(relatedName); - historyDetailPO.setOperateDetail("未找到编号为[" + reallyValue + "]的职等"); + historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等"); historyDetailPO.setStatus("0"); saveImportDetailLog(historyDetailPO); continue nextRow; @@ -1788,6 +1788,13 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ if (split.length > 0) { for (int index = 0; index < split.length; index++) { levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId()); + if (levelNew == null) { + historyDetailPO.setRelatedName(relatedName); + historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } if (levelIds != null) { levelIds = levelIds + "," + levelNew.getId(); } else { @@ -1860,7 +1867,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } break; case 2: - String gradeNo = (String) map.get("grade_no"); String schemeNo2 = (String) map.get("scheme_no"); String levelNo2 = (String) map.get("level_no"); schemeNew = MapperProxyFactory.getProxy(SchemeMapper.class).getSchemeByNo(schemeNo2); @@ -1871,20 +1877,19 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ saveImportDetailLog(historyDetailPO); continue nextRow; } - gradeNew = MapperProxyFactory.getProxy(GradeMapper.class).getGradeByNoAndSid(gradeNo, schemeNew.getId()); - if (gradeNew == null) { - historyDetailPO.setRelatedName(relatedName); - historyDetailPO.setOperateDetail("未找到编号为[" + schemeNo2 + "]的职等"); - historyDetailPO.setStatus("0"); - saveImportDetailLog(historyDetailPO); - continue nextRow; - } // 处理职级编号 String[] split = levelNo2.split(","); String levelIds = null; if (split.length > 0) { for (int index = 0; index < split.length; index++) { levelNew = MapperProxyFactory.getProxy(LevelMapper.class).getLevelByNoAndSid(split[index], schemeNew.getId()); + if (levelNew == null) { + historyDetailPO.setRelatedName(relatedName); + historyDetailPO.setOperateDetail("未找到编号为[" + split[index] + "]的职等"); + historyDetailPO.setStatus("0"); + saveImportDetailLog(historyDetailPO); + continue nextRow; + } if (levelIds != null) { levelIds = levelIds + "," + levelNew.getId(); } else {