From af7ec6f43dc1c8a80fe23cb5a437eef27ea5002d Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Wed, 11 Feb 2026 15:09:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=E9=AA=8C=E8=AF=81=E9=A1=BA=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88=E9=A3=8E=E9=99=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将身份证号存在性检查移到基本数据验证之后
- 此时 personId 已确保不为空且格式正确
- 错误信息更准确，包含操作建议
---
 ...diStaffEnterpriseRelationImportServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java
index 69cf3a9..070e204 100644
--- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java
+++ b/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java
@@ -96,13 +96,6 @@ public class CcdiStaffEnterpriseRelationImportServiceImpl implements ICcdiStaffE
             CcdiStaffEnterpriseRelationExcel excel = excelList.get(i);
 
             try {
-                // 身份证号存在性检查
-                if (!existingPersonIds.contains(excel.getPersonId())) {
-                    throw new RuntimeException(String.format(
-                        "第%d行: 身份证号[%s]不存在于员工信息表中",
-                        i + 1, excel.getPersonId()));
-                }
-
                 // 转换为AddDTO进行验证
                 CcdiStaffEnterpriseRelationAddDTO addDTO = new CcdiStaffEnterpriseRelationAddDTO();
                 BeanUtils.copyProperties(excel, addDTO);
@@ -110,6 +103,13 @@ public class CcdiStaffEnterpriseRelationImportServiceImpl implements ICcdiStaffE
                 // 验证数据
                 validateRelationData(addDTO);
 
+                // 身份证号存在性检查（在基本验证之后）
+                if (!existingPersonIds.contains(excel.getPersonId())) {
+                    throw new RuntimeException(String.format(
+                        "第%d行: 身份证号[%s]不存在于员工信息表中，请先添加员工信息",
+                        i + 1, excel.getPersonId()));
+                }
+
                 String combination = excel.getPersonId() + "|" + excel.getSocialCreditCode();
 
                 CcdiStaffEnterpriseRelation relation = new CcdiStaffEnterpriseRelation();