From e72501f17d4eb30ec9debb12f948a39d3debb3c1 Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Mon, 3 Nov 2025 15:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ed62e2c9b00b1617301b823f99644cae336f111c)
---
 .../impl/DataImportNewServiceImpl.java        | 20 ++++++++++++++++---
 .../service/impl/DataVerifyServiceImpl.java   |  2 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
index 554912e..6dae859 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
@@ -1289,13 +1289,27 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                             if (dMap != null){
                                 account.setField("ContentDocumentId", dMap.get("new_id").toString());
                             }else {
-                                log.info("ContentDocumentLink Id: {}，对应的ContentDocumentId: {} 数据不存在！ " , id, contentDocumentId);
+                                String errorMessage = String.format("ContentDocumentLink Id: %s，对应的ContentDocumentId: %s 数据不存在！", id, contentDocumentId);
+                                log.info(errorMessage);
+                                List<Map<String, Object>> maps = new ArrayList<>();
+                                Map<String, Object> linkMap1 = new HashMap<>();
+                                linkMap1.put("key", "error_message");
+                                linkMap1.put("value", errorMessage);
+                                maps.add(linkMap1);
+                                customMapper.updateById(api, maps, id);
                                 continue;
                             }
                             if (lMap != null){
                                 account.setField("LinkedEntityId", lMap.get("new_id").toString());
                             }else {
-                                log.info("ContentDocumentLink Id: {}，对应的LinkedEntityId: {} 数据不存在！ " , id, linkedEntityId);
+                                String errorMessage = String.format("ContentDocumentLink Id: %s，对应的LinkedEntityId: %s 数据不存在！", id, linkedEntityId);
+                                log.info(errorMessage);
+                                List<Map<String, Object>> maps = new ArrayList<>();
+                                Map<String, Object> linkMap1 = new HashMap<>();
+                                linkMap1.put("key", "error_message");
+                                linkMap1.put("value", errorMessage);
+                                maps.add(linkMap1);
+                                customMapper.updateById(api, maps, id);
                                 continue;
                             }
                             account.setField("ShareType", shareType);
@@ -1527,7 +1541,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                 break;
                             }else {
                                 failCount++;
-                                log.error("文件下载失败，第"+ failCount +"次！, id: "+ id + "，返回体信息：" + response.message());
+                                log.info("文件下载失败，第"+ failCount +"次！, id: "+ id + "，返回体信息：" + response.message());
                             }
                         }
 
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 12651c7..0d85339 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java
@@ -2029,6 +2029,7 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file
         String idSql = "SELECT FIELDS(ALL) FROM " + objectApi + " WHERE " + idCondition;
         // 将结果转换为Map便于比对
         Map<String, SObject> queryMap = Maps.newHashMap();
+        log.info("查询ORG数据，SQL: {}", idSql);
         try {
             QueryResult queryResult = connect.queryAll(idSql);
             if (queryResult.getRecords() != null) {
@@ -2049,6 +2050,7 @@ private void sendIncrementalQualityCheckEmail(DataVerifyParam param, String file
         // 查询本地数据库获取ID列表
         String idSql = " CreatedDate >= '" + startDate + "'" +
                 " AND CreatedDate < '" + endDate + "'" +
+                " AND new_id is not null " +
                 " ORDER BY Id ASC LIMIT " + (page * MAX_PAGE_RECORDS) + "," + MAX_PAGE_RECORDS;
 
         return customMapper.list("Id,new_id", objectApi, idSql);