From abb4753713977f113cc4d8d0bba87a82251b412d Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Tue, 21 Oct 2025 15:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 32047b2287743399d61fdb1d29313452585ede63)
---
 files/start.sh                                            | 2 +-
 .../datadump/service/impl/CommonBatchServiceImpl.java     | 8 ++++----
 .../datadump/service/impl/DataVerifyServiceImpl.java      | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/files/start.sh b/files/start.sh
index c86780c..132098a 100644
--- a/files/start.sh
+++ b/files/start.sh
@@ -5,7 +5,7 @@
 #dbUsername="root"
 #dbPassword="celnet@2025.bln"
 #携科
-dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false"
+dbUrl="jdbc:mysql://127.0.0.1:3306/data-dump-xxl-job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai"
 dbUsername="root"
 dbPassword="Celnet2025.QY"
 #其它
diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java
index 30081aa..26a66cd 100644
--- a/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java
@@ -245,11 +245,11 @@ public class CommonBatchServiceImpl implements CommonBatchService {
                         String line;
                         int lineCount = 0;
                         while ((line = bufferedReader.readLine()) != null) {
-                            // 保存第一行作为标题行，并替换CreatedDate和CreatedById为Original_Created_Date__c和Original_Created_By__c
-                            // 但要确保不替换CreatedDate__c和CreatedById__c这样的自定义字段
-                            line = line.replaceAll("(?<!__)CreatedDate(?!__)", "Original_Created_Date__c")
-                                    .replaceAll("(?<!__)CreatedById(?!__)", "Original_Created_By__c");
                             if (headerLine == null) {
+                                // 保存第一行作为标题行，并替换CreatedDate和CreatedById为Original_Created_Date__c和Original_Created_By__c
+                                // 但要确保不替换CreatedDate__c和CreatedById__c这样的自定义字段
+                                line = line.replaceAll("(?<!__)CreatedDate(?!__)", "Original_Created_Date__c")
+                                        .replaceAll("(?<!__)CreatedById(?!__)", "Original_Created_By__c");
                                 headerLine = line;
                             }
                             lineCount++;
diff --git a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
index d83029d..372634c 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
@@ -865,6 +865,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
                         for (DataField field : fields) {
                             String fieldName = field.getField();
 
+
                             if (Const.EXCLUDE_FIELDS.contains(fieldName))
                                 continue; // 跳过字段比较
 
@@ -886,7 +887,8 @@ public class DataVerifyServiceImpl implements DataVerifyService {
 
                             if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) {
 
-                                if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){
+                                String[] split = referenceTo.split(",");
+                                if (split.length > 1 && !"User".equals(referenceTo)){
                                     continue;
                                 }
                                 if (StringUtils.isBlank(referenceTo)){
@@ -894,6 +896,7 @@ public class DataVerifyServiceImpl implements DataVerifyService {
                                 }
 
                                 Map<String, Object> objectMap = customMapper.getById("new_id", referenceTo, String.valueOf(sourceValue));
+
                                 if (objectMap == null || !String.valueOf(objectMap.get("new_id")).equals(String.valueOf(targetValue))) {
                                     List<String> row = Lists.newArrayList();
                                     row.add(String.valueOf(batch.getId()));
@@ -1357,7 +1360,8 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file
 
                         if (referenceTo != null &&field.getSfType().equals("reference") && !referenceTo.equals("data_picklist")) {
 
-                            if (field.getReferenceTo().length() > 1 && !"User".equals(referenceTo)){
+                            String[] split = referenceTo.split(",");
+                            if (split.length > 1 && !"User".equals(referenceTo)){
                                 continue;
                             }
                             if (StringUtils.isBlank(referenceTo)){