From 36da82daff33b49cffaeb4e5262e570d8771ec63 Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Fri, 29 Aug 2025 22:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E5=A2=9E=E9=87=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8CFeedItem=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=81=9Acount(Id)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../celnet/datadump/service/impl/CommonServiceImpl.java    | 7 +++++--
 .../datadump/service/impl/DataImportNewServiceImpl.java    | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
index 3ca5d5b..3f878f5 100644
--- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
@@ -578,7 +578,9 @@ public class CommonServiceImpl implements CommonService {
                 param.setIsDeleted(null);
             }
 
-            dataBatchHistory.setSfNum(countSfNum(connect, param));
+            if (!"FeedItem".equals(api) && !"ContentFolderMember ".equals(api)) {
+                dataBatchHistory.setSfNum(countSfNum(connect, param));
+            }
 
             getAllSfData(param, connect, dataReport);
 
@@ -901,6 +903,7 @@ public class CommonServiceImpl implements CommonService {
                             paramMap.put("key", key);
                             paramMap.put("value", false);
                             maps.add(paramMap);
+                            continue;
                         }
 
                         Map<String, Object> paramMap = Maps.newHashMap();
@@ -909,7 +912,7 @@ public class CommonServiceImpl implements CommonService {
                         maps.add(paramMap);
                     }
                 }
-                
+
 
                 if (existsIds.contains(id)) {
                     customMapper.updateById(api, maps, id);
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 4bd564f..317da7e 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
@@ -2961,6 +2961,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                     for (int j = 1; j <= sized; j++) {
                         SObject account = new SObject();
                         account.setType(api);
+                        String message = null ;
                         //给对象赋值
                         for (DataField dataField : list) {
                             String field = dataField.getField();
@@ -2993,7 +2994,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                     if (m != null && !m.isEmpty()) {
                                         account.setField(field, m.get("new_id"));
                                     }else {
-                                        String message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"不存在！";
+                                        message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"不存在！";
                                         log.info(message);
                                         break;
                                     }
@@ -3006,6 +3007,9 @@ public class DataImportNewServiceImpl implements DataImportNewService {
                                 }
                             }
                         }
+                        if (message != null){
+                            break;
+                        }
                         if (dataObject.getIsEditable()){
                             account.setField("old_owner_id__c", data.get(j - 1).get("OwnerId"));
                             account.setField("old_sfdc_id__c", data.get(j - 1).get("Id"));