Merge pull request #17528 from abpframework/auto-merge/rel-7-4/2158

Merge branch dev with rel-7.4

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs

@@ -126,6 +126,11 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
     {
         CheckReadOnly();
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         var dbContext = await GetDbContextAsync();
         cancellationToken = GetCancellationToken(cancellationToken);
 
@@ -172,14 +177,21 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
     public async override Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         CheckReadOnly();
+
         cancellationToken = GetCancellationToken(cancellationToken);
 
         if (BulkOperationProvider != null)
         {
             await BulkOperationProvider.UpdateManyAsync<TDbContext, TEntity>(
                 this,
-                entities,
+                entityArray,
                 autoSave,
                 GetCancellationToken(cancellationToken)
                 );
@@ -189,7 +201,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
         var dbContext = await GetDbContextAsync();
 
-        dbContext.Set<TEntity>().UpdateRange(entities);
+        dbContext.Set<TEntity>().UpdateRange(entityArray);
 
         if (autoSave)
         {
@@ -212,6 +224,12 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
     public async override Task DeleteManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         CheckReadOnly();
         cancellationToken = GetCancellationToken(cancellationToken);
 
@@ -219,7 +237,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
         {
             await BulkOperationProvider.DeleteManyAsync<TDbContext, TEntity>(
                 this,
-                entities,
+                entityArray,
                 autoSave,
                 cancellationToken
             );
@@ -229,7 +247,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
         var dbContext = await GetDbContextAsync();
 
-        dbContext.RemoveRange(entities);
+        dbContext.RemoveRange(entityArray.Select(x => x));
 
         if (autoSave)
         {

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs

@@ -138,9 +138,13 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
     public async override Task InsertManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
-        cancellationToken = GetCancellationToken(cancellationToken);
-
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        cancellationToken = GetCancellationToken(cancellationToken);
 
         foreach (var entity in entityArray)
         {
@@ -228,6 +232,10 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
     public async override Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
     {
         var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
 
         foreach (var entity in entityArray)
         {
@@ -358,12 +366,18 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
        bool autoSave = false,
        CancellationToken cancellationToken = default)
     {
+        var entityArray = entities.ToArray();
+        if (entityArray.IsNullOrEmpty())
+        {
+            return;
+        }
+
         cancellationToken = GetCancellationToken(cancellationToken);
 
         var softDeletedEntities = new Dictionary<TEntity, string>();
         var hardDeletedEntities = new List<TEntity>();
 
-        foreach (var entity in entities)
+        foreach (var entity in entityArray)
         {
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity))
             {
@@ -383,7 +397,7 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
 
         if (BulkOperationProvider != null)
         {
-            await BulkOperationProvider.DeleteManyAsync(this, entities, dbContext.SessionHandle, autoSave, cancellationToken);
+            await BulkOperationProvider.DeleteManyAsync(this, entityArray, dbContext.SessionHandle, autoSave, cancellationToken);
             return;
         }