- 修复 Repository/DbContext 批量修改可能无效的 bug；#709

Author: 2881099

FreeSql.DbContext/DbContext/DbContextAsync.cs

@@ -28,6 +28,7 @@ async internal Task FlushCommandAsync(CancellationToken cancellationToken)
 
             PrevCommandInfo oldinfo = null;
             var states = new List<object>();
+            var flagFuncUpdateLaststate = false;
 
             Task<int> dbsetBatch(string method)
             {
@@ -77,15 +78,23 @@ async Task funcUpdate(bool isLiveUpdate)
                 { //没有执行更新
                     var laststate = states[states.Count - 1];
                     states.Clear();
-                    if (affrows == -997) states.Add(laststate); //保留最后一个
+                    if (affrows == -997)
+                    {
+                        flagFuncUpdateLaststate = true;
+                        states.Add(laststate); //保留最后一个
+                    }
                 }
                 if (affrows > 0)
                 {
                     _affrows += affrows;
                     var islastNotUpdated = states.Count != affrows;
                     var laststate = states[states.Count - 1];
                     states.Clear();
-                    if (islastNotUpdated) states.Add(laststate); //保留最后一个
+                    if (islastNotUpdated)
+                    {
+                        flagFuncUpdateLaststate = true;
+                        states.Add(laststate); //保留最后一个
+                    }
                 }
             };
 
@@ -94,6 +103,7 @@ async Task funcUpdate(bool isLiveUpdate)
                 var info = _prevCommands.Any() ? _prevCommands.Dequeue() : null;
                 if (oldinfo == null) oldinfo = info;
                 var isLiveUpdate = false;
+                flagFuncUpdateLaststate = false;
 
                 if (_prevCommands.Any() == false && states.Any() ||
                     info != null && oldinfo.changeType != info.changeType ||
@@ -130,6 +140,9 @@ async Task funcUpdate(bool isLiveUpdate)
                 {
                     states.Add(info.state);
                     oldinfo = info;
+
+                    if (flagFuncUpdateLaststate && oldinfo.changeType == EntityChangeType.Update) //马上与上个元素比较
+                        await funcUpdate(isLiveUpdate);
                 }
             }
             isFlushCommanding = false;

FreeSql.DbContext/DbContext/DbContextSync.cs

@@ -44,6 +44,7 @@ internal void FlushCommand()
 
             PrevCommandInfo oldinfo = null;
             var states = new List<object>();
+            var flagFuncUpdateLaststate = false;
 
             int dbsetBatch(string method)
             {
@@ -92,15 +93,23 @@ void funcUpdate(bool isLiveUpdate)
                 { //没有执行更新
                     var laststate = states[states.Count - 1];
                     states.Clear();
-                    if (affrows == -997) states.Add(laststate); //保留最后一个
+                    if (affrows == -997)
+                    {
+                        flagFuncUpdateLaststate = true;
+                        states.Add(laststate); //保留最后一个
+                    }
                 }
                 if (affrows > 0)
                 {
                     _affrows += affrows;
                     var islastNotUpdated = states.Count != affrows;
                     var laststate = states[states.Count - 1];
                     states.Clear();
-                    if (islastNotUpdated) states.Add(laststate); //保留最后一个
+                    if (islastNotUpdated)
+                    {
+                        flagFuncUpdateLaststate = true;
+                        states.Add(laststate); //保留最后一个
+                    }
                 }
             };
 
@@ -109,6 +118,7 @@ void funcUpdate(bool isLiveUpdate)
                 var info = _prevCommands.Any() ? _prevCommands.Dequeue() : null;
                 if (oldinfo == null) oldinfo = info;
                 var isLiveUpdate = false;
+                flagFuncUpdateLaststate = false;
 
                 if (_prevCommands.Any() == false && states.Any() ||
                     info != null && oldinfo.changeType != info.changeType ||
@@ -145,6 +155,9 @@ void funcUpdate(bool isLiveUpdate)
                 {
                     states.Add(info.state);
                     oldinfo = info;
+
+                    if (flagFuncUpdateLaststate && oldinfo.changeType == EntityChangeType.Update) //马上与上个元素比较
+                        funcUpdate(isLiveUpdate);
                 }
             }
             isFlushCommanding = false;