From 706edd43ed5dde4a857d789051f04bdcf7e9bb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98ml=E2=80=99?= <mlin219@126.com>
Date: Tue, 15 Nov 2022 14:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=BA=A7=E5=AF=BC=E5=85=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=961115?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImportCommonServiceImpl.java | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

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<LevelPO> 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 {