diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs index 2054d0e9db..3bea6ad447 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs @@ -16,17 +16,11 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling { b.TryConfigureConcurrencyStamp(); b.TryConfigureExtraProperties(); - b.TryConfigureSoftDelete(); - b.TryConfigureDeletionTime(); b.TryConfigureMayHaveCreator(); b.TryConfigureMustHaveCreator(); b.TryConfigureDeletionAudited(); b.TryConfigureCreationTime(); - b.TryConfigureCreationAudited(); - b.TryConfigureLastModificationTime(); b.TryConfigureModificationAudited(); - b.TryConfigureAudited(); - b.TryConfigureFullAudited(); b.TryConfigureMultiTenant(); } @@ -92,9 +86,10 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling public static void TryConfigureDeletionTime(this EntityTypeBuilder b) { + b.TryConfigureSoftDelete(); + if (b.Metadata.ClrType.IsAssignableTo()) { - b.TryConfigureSoftDelete(); b.Property(nameof(IHasDeletionTime.DeletionTime)) .IsRequired(false) .HasColumnName(nameof(IHasDeletionTime.DeletionTime)); @@ -141,9 +136,10 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling public static void TryConfigureDeletionAudited(this EntityTypeBuilder b) { + b.TryConfigureDeletionTime(); + if (b.Metadata.ClrType.IsAssignableTo()) { - b.TryConfigureDeletionTime(); b.Property(nameof(IDeletionAuditedObject.DeleterId)) .IsRequired(false) .HasColumnName(nameof(IDeletionAuditedObject.DeleterId)); @@ -205,9 +201,10 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling public static void TryConfigureModificationAudited(this EntityTypeBuilder b) { + b.As().TryConfigureLastModificationTime(); + if (b.Metadata.ClrType.IsAssignableTo()) { - b.As().TryConfigureLastModificationTime(); b.Property(nameof(IModificationAuditedObject.LastModifierId)) .IsRequired(false) .HasColumnName(nameof(IModificationAuditedObject.LastModifierId));