fix for Bug apex-enterprise-patterns#221

dsurfleet · Apr 23, 2021 · d67e961 · d67e961
1 parent 83ac48b
commit d67e961
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sfdx-source/apex-common/main/classes/fflib_SObjectUnitOfWork.cls b/sfdx-source/apex-common/main/classes/fflib_SObjectUnitOfWork.cls
@@ -683,6 +683,7 @@ public virtual class fflib_SObjectUnitOfWork
 	{
 		for (Schema.SObjectType sObjectType : m_sObjectTypes)
 		{
+            m_relationships.get(sObjectType.getDescribe().getName()).resolve();
 			m_dml.dmlUpdate(m_dirtyMapByType.get(sObjectType.getDescribe().getName()).values());
 		}
 	}
@@ -875,7 +876,10 @@ public virtual class fflib_SObjectUnitOfWork
 
         public void resolve()
         {
-            this.Record.put( this.RelatedToField, this.RelatedTo.Id);
+            //check relationship Id due to update use.
+            if (this.Record.get(this.RelatedToField) == null){
+                this.Record.put( this.RelatedToField, this.RelatedTo.Id);
+            }
         }
     }