src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -618,11 +618,11 @@ namespace Hotline.Api.Controllers
                 throw UserFriendlyException.SameMessage("未配置流程模板");
 
             //知识审批主表
-            await _knowledgeDomainService.AddWorkFlowAsync(id, eKnowledgeApplyType, HttpContext.RequestAborted);
+            var flowId = await _knowledgeDomainService.AddWorkFlowAsync(id, eKnowledgeApplyType, HttpContext.RequestAborted);
 
             dto.DefinitionCode = definition.Code;
             dto.Title = knowledge.Title;
-            await _workflowApplication.StartWorkflowAsync(dto, id, HttpContext.RequestAborted);
+            await _workflowApplication.StartWorkflowAsync(dto, flowId, HttpContext.RequestAborted);
 
 
             //if (eKnowledgeApplyType != EKnowledgeApplyType.Delete)

src/Hotline.Api/Hotline.Api.csproj

@@ -10,13 +10,14 @@
 
   <ItemGroup>
     <PackageReference Include="Exceptionless.AspNetCore" Version="4.8.0" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.1" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
     <PackageReference Include="IdentityModel" Version="6.0.0" />
     <PackageReference Include="Mapster.DependencyInjection" Version="1.0.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.8" />
     <PackageReference Include="Serilog.Sinks.Exceptionless" Version="3.1.5" />
+    <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
     <PackageReference Include="Serilog.Sinks.MongoDB" Version="5.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

src/Hotline/KnowledgeBase/IKnowledgeDomainService.cs

@@ -48,11 +48,7 @@ namespace Hotline.KnowledgeBase
         /// <summary>
         /// 修改流程ID
         /// </summary>
-        /// <param name="knowledgeId"></param>
-        /// <param name="workFlowId"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns></returns>
-        Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeId, string workFlowId, CancellationToken cancellationToken);
+        Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeFlowId, string workFlowId, CancellationToken cancellationToken);
 
         /// <summary>
         /// 撤销

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -103,23 +103,23 @@ namespace Hotline.KnowledgeBase
         /// <param name="workFlowId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeId, string workFlowId, CancellationToken cancellationToken)
+        public async Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeFlowId, string workFlowId, CancellationToken cancellationToken)
         {
-            if (string.IsNullOrEmpty(knowledgeId))
+            if (string.IsNullOrEmpty(knowledgeFlowId))
                 throw UserFriendlyException.SameMessage("无效知识编号");
             var knowledgeFlow =
-                await _knowledgeWorkFlowRepository.GetAsync(d => d.KnowledgeId == knowledgeId, cancellationToken);
+                await _knowledgeWorkFlowRepository.GetAsync(knowledgeFlowId, cancellationToken);
             if (knowledgeFlow == null)
-                throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeId}", "无效知识编号");
+                throw new UserFriendlyException($"无效知识编号, knowledgeFlowId: {knowledgeFlowId}", "无效知识编号");
             knowledgeFlow.WorkflowId = workFlowId;
             knowledgeFlow.Assign(assignMode.FlowAssignType, assignMode.Handlers);
             await _knowledgeWorkFlowRepository.UpdateAsync(knowledgeFlow, cancellationToken);
 
             if (knowledgeFlow.WorkflowModuleStatus != EKnowledgeApplyType.Delete)
             {
-                var knowledge = await _knowledgeRepository.GetAsync(knowledgeId, cancellationToken);
+                var knowledge = await _knowledgeRepository.GetAsync(knowledgeFlow.KnowledgeId, cancellationToken);
                 if (knowledge == null)
-                    throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeId}", "无效知识编号");
+                    throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeFlow.KnowledgeId}", "无效知识编号");
                 knowledge.WorkflowId = workFlowId;
                 knowledge.Assign(assignMode.FlowAssignType, assignMode.Handlers);
                 await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);