Merge pull request #12763 from abpframework/auto-merge/rel-5-3/1111

Merge branch dev with rel-5.3

docs/en/CurrentUser.md

@@ -90,7 +90,7 @@ Beside these standard methods, there are some extension methods:
 
 For a web application, it gets the `User` property of the current `HttpContext`. For a non-web application, it returns the `Thread.CurrentPrincipal`.
 
-> You generally don't need to this low level `ICurrentPrincipalAccessor` service and directly work with the `ICurrentUser` explained above.
+> You generally don't need to use this low level `ICurrentPrincipalAccessor` service and just directly work with the `ICurrentUser` explained above.
 
 ### Basic Usage
 

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

@@ -231,8 +231,8 @@ public class MongoDbRepository<TMongoDbContext, TEntity>
         {
             SetModificationAuditProperties(entity);
 
-            var isSoftDeleteEntity = typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity));
+            var isEntityDeleted = entity is ISoftDelete softDeleteEntity && softDeleteEntity.IsDeleted;
-            if (isSoftDeleteEntity)
+            if (isEntityDeleted)
             {
                 SetDeletionAuditProperties(entity);
                 TriggerEntityDeleteEvents(entity);