From e3c4b3dfdd9babc51d1c15636fbe63d48a0ef9c7 Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Wed, 19 Nov 2025 10:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A2=9E=E9=87=8F=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DataDumpSpecialServiceImpl.java      |  3 +-
 .../resources/mapper/SalesforceMapper.xml     | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/celnet/datadump/service/impl/DataDumpSpecialServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataDumpSpecialServiceImpl.java
index 770e271..b816025 100644
--- a/src/main/java/com/celnet/datadump/service/impl/DataDumpSpecialServiceImpl.java
+++ b/src/main/java/com/celnet/datadump/service/impl/DataDumpSpecialServiceImpl.java
@@ -262,8 +262,9 @@ public class DataDumpSpecialServiceImpl implements DataDumpSpecialService {
                         // 判断是否存在要排除的id
                         salesforceParam.setMaxId(maxId);
                         salesforceParam.setBeginModifyDate(dataObject.getLastUpdateDate());
+                        salesforceParam.setUpdateField(dataFieldService.returnUpdateDateField(dataObject.getName()));
                         map.put("param", salesforceParam);
-                        String sql = SqlUtil.showSql("com.celnet.datadump.mapper.SalesforceMapper.listOrderByIdNew", map);
+                        String sql = SqlUtil.showSql("com.celnet.datadump.mapper.SalesforceMapper.listOrderByIdShare", map);
                         log.info("query sql: {}", sql);
                         XxlJobLogger.log("query sql: {}", sql);
                         QueryResult queryResult = connect.queryAll(sql);
diff --git a/src/main/resources/mapper/SalesforceMapper.xml b/src/main/resources/mapper/SalesforceMapper.xml
index 45ad41a..585eac0 100644
--- a/src/main/resources/mapper/SalesforceMapper.xml
+++ b/src/main/resources/mapper/SalesforceMapper.xml
@@ -238,4 +238,43 @@
         </if>
     </select>
 
+
+    <select id="listOrderByIdShare">
+        select ${param.select} from ${param.api}
+        <where>
+            <if test="param != null">
+                <if test="param.maxId != null">
+                    AND id > #{param.maxId}
+                </if>
+                <if test="param.isDeleted != null">
+                    AND IsDeleted = #{param.isDeleted}
+                </if>
+                <if test="param.sql != null">
+                    AND ${param.sql}
+                </if>
+                <!-- 判断 param.api 是否以 "Share" 结尾 -->
+                <if test="param.api != null and param.api.endsWith('Share')">
+                    AND RowCause NOT IN (
+                    'Owner', 'Rule', 'Territory', 'Team',
+                    'ImplicitChild', 'ImplicitParent', 'TerritoryRule',
+                    'ImplicitCallCenter', 'PortalRole', 'Portal',
+                    'ImplicitPerson', 'ImplicitGrant'
+                    )
+                </if>
+                <if test="param.beginModifyDate">
+                    AND #{param.updateField} >= #{param.beginModifyDate}
+                </if>
+
+            </if>
+        </where>
+        <if test="param != null">
+            <if test="param.idField != null">
+                order by ${param.idField} asc
+            </if>
+        </if>
+        <if test="param != null and param.limit != null">
+            limit #{param.limit}
+        </if>
+    </select>
+
 </mapper>