From 39771f44759c062999d1966153900feee4d9d947 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sat, 13 Apr 2024 17:01:02 +0800
Subject: [PATCH] Skip if `navigationEntry.CurrentValue` is `null`.

---
 .../ChangeTrackers/AbpEfCoreNavigationHelper.cs             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
index b7b044332b..a173f4562d 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
@@ -50,6 +50,12 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
         var index = 0;
         foreach (var navigationEntry in entityEntry.Navigations.Where(navigation => !navigation.IsModified))
         {
+            if (!navigationEntry.IsLoaded && navigationEntry.CurrentValue == null)
+            {
+                index++;
+                continue;
+            }
+
             var currentValue = navigationEntry.CurrentValue;
             if (navigationEntry.CurrentValue is ICollection collection)
             {