src/Hotline.Api/StartupHelper.cs

@@ -9,6 +9,7 @@ using Microsoft.OpenApi.Models;
 using XF.Domain.Entities;
 using XF.Domain.Exceptions;
 using XF.Domain.Options;
+using XF.Domain.Repository;
 
 namespace Hotline.Api
 {
@@ -175,15 +176,13 @@ namespace Hotline.Api
                 .Ignore(d => d.CreatorOrgCode)
                 .Ignore(d => d.AreaId);
             config.ForDestinationType<IWorkflow>()
-                .Ignore(d => d.WorkflowId)
-                .Ignore(d => d.ExpiredTimeConfigId)
-                .Ignore(d => d.AssignOrgCodes)
-                .Ignore(d => d.AssignUserIds);
+                .Ignore(d => d.ExpiredTimeConfigId);
             config.ForDestinationType<IHasCreationTime>()
                 .Ignore(d => d.CreationTime);
             config.ForDestinationType<IHasDeletionTime>().Ignore(d => d.DeletionTime);
             config.ForDestinationType<ISoftDelete>().Ignore(d => d.IsDeleted);
             config.ForDestinationType<IHasModificationTime>().Ignore(d => d.LastModificationTime);
+            config.ForDestinationType<Entity>().Ignore(d => d.Id);
 
             services.AddSingleton(config);
             services.AddScoped<IMapper, ServiceMapper>();

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -164,24 +164,6 @@ namespace Hotline.Application.Mappers
                 .IgnoreIf((s, d) => s.OrderComplain == null, d => d.OrderComplain)
                 .IgnoreIf((s, d) => s.OrderReport == null, d => d.OrderReport)
                 .IgnoreIf((s, d) => s.Hotspot == null, d => d.Hotspot)
-                //.IgnoreIf((s, d) => s.Workflow == null, d => d.Workflow)
-                //.Ignore(d => d.Workflow.Definition)
-                //.Ignore(d => d.Workflow.StepBoxes)
-                //.Ignore(d => d.Workflow.Traces)
-                //.Ignore(d => d.Workflow)
-                //.AfterMapping((s, d) =>
-                //{
-                //    d.Workflow ??= new();
-                //    if (s.Workflow?.Supplements.Any() ?? false)
-                //    {
-                //        d.Workflow.Supplements = s.Workflow.Supplements.Adapt<List<WorkflowSupplementDto>>();
-                //    }
-
-                //    if (s.Workflow?.Assigns.Any() ?? false)
-                //    {
-                //        d.Workflow.Assigns = s.Workflow.Assigns.Adapt<List<WorkflowAssignDto>>();
-                //    }
-                //})
                 ;
 
             config.ForType<AddOrderDto, Order>()
@@ -194,7 +176,7 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.OrderReport.Id, x => x.Id);
 
             config.ForType<Workflow, Order>()
-                //.Map(d => d.WorkflowId, s => s.Id)
+                .Map(d => d.WorkflowId, s => s.Id)
                 .Map(d => d.StartTime, s => s.CreationTime)
                 .Map(d => d.ExpiredTime, s => s.ExpiredTime)
                 .Map(d => d.ActualHandleStepCode, s => s.ActualHandleStepCode)
@@ -222,7 +204,6 @@ namespace Hotline.Application.Mappers
                 .IgnoreNonMapped(true)
                 .AfterMapping((s, d) =>
                 {
-                    d.WorkflowId = s.Id;
                     d.UpdateHandlingStatus(s.IsInCountersign());
                 })
                 ;