From 25a5d58847e9e8770bbb4da625d9d55cb517439e Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Thu, 6 Aug 2026 16:58:46 +0800
Subject: [PATCH] sign

---
 .../app/support/OrgPersonnelExcelImporter.java     | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java
index bb6decb..5769f9d 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java
@@ -527,6 +527,7 @@ public class OrgPersonnelExcelImporter {
             if (gender == null) {
                 errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(),
                         "性别[" + genderText + "]无法识别，跳过该行"));
+                row.setValidateFail(true);
                 return null;
             }
             entity.setGenderCode(gender.getCode());
@@ -540,6 +541,7 @@ public class OrgPersonnelExcelImporter {
             if (register == null) {
                 errors.add(new OrgPersonnelImportErrorCO(row.getRowIndex(), entity.getAccount(), entity.getUserName(),
                         "是否注册安全工程师[" + registerText + "]无法识别，跳过该行"));
+                row.setValidateFail(true);
                 return null;
             }
             entity.setRegisterEngineerFlag(register.getCode());
@@ -547,17 +549,7 @@ public class OrgPersonnelExcelImporter {
 
         // 学历：兜底字典映射，匹配不到则原样存名称
         String educationText = trim(row.getEducation());
-        if (StringUtils.hasText(educationText)) {
-            ImportEducationEnum education = ImportEducationEnum.match(educationText);
-            if (education != null) {
-                entity.setEducationCode(education.getEducationCode());
-                entity.setEducationName(education.getEducationName());
-                entity.setEducationLevelCode(education.getEducationLevelCode());
-                entity.setEducationLevelName(education.getEducationLevelName());
-            } else {
-                entity.setEducationName(educationText);
-            }
-        }
+        entity.setEducationName(educationText);
 
         // 职称：无字典，按分隔符拆分后原样存入（保留信息，待后续字典完善）
         entity.setTitleCodeArr(parseTitles(trim(row.getTitle())));