diff --git a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php index cf790beaed3d7efd15860c3c0f777c2013caffef..59d0c1271f27a1bd933af3dbe8016eca39297eb3 100644 --- a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php +++ b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php @@ -682,8 +682,12 @@ class SalesforceMapping extends ConfigEntityBase implements SalesforceMappingInt $mapped_fields = $this->getPullFieldsArray(); } $soql->fields = $mapped_fields; - $soql->fields[] = 'Id'; - $soql->fields[] = $this->getPullTriggerDate(); + $soql->fields['Id'] = 'Id'; + $pull_trigger_date = $this->getPullTriggerDate(); + $soql->fields[$pull_trigger_date] = $pull_trigger_date; + if ($pull_trigger_date !== 'LastModifiedDate') { + $soql->fields['LastModifiedDate'] = 'LastModifiedDate'; + } $start = $start > 0 ? $start : $this->getLastPullTime(); // If no lastupdate and no start window provided, get all records. diff --git a/modules/salesforce_pull/src/Plugin/QueueWorker/PullBase.php b/modules/salesforce_pull/src/Plugin/QueueWorker/PullBase.php index 6950cbaa26a73fc448c94a84571ceb554c7158cf..4abece93dc17f130048fcbcffe362199ad2bb38a 100644 --- a/modules/salesforce_pull/src/Plugin/QueueWorker/PullBase.php +++ b/modules/salesforce_pull/src/Plugin/QueueWorker/PullBase.php @@ -168,7 +168,7 @@ abstract class PullBase extends QueueWorkerBase implements ContainerFactoryPlugi : $mapped_object->getChanged(); $pull_trigger_date = - $sf_object->field($mapping->getPullTriggerDate()); + $sf_object->field($mapping->getPullTriggerDate()) ?? $sf_object->field('LastModifiedDate'); $sf_record_updated = $pull_trigger_date ? strtotime($pull_trigger_date) : 0; $mapped_object