Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -207,15 +207,14 @@ namespace Hotline.Api.Controllers
 				throw UserFriendlyException.SameMessage("知识库数据不可修改");
 			_mapper.Map(dto.Data, knowledge);
 			//if (update.Tags.Any()) await _repositoryts.UpdateVectorAsync(update.Id, update.Tags, HttpContext.RequestAborted);
+			await _knowledgeRepository.UpdateAsync(knowledge, HttpContext.RequestAborted);
 			if (dto.Workflow != null)
 			{
 				var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
 				startDto.DefinitionModuleCode = WorkflowModuleConsts.KnowledgeUpdate;
 				startDto.Title = "知识库修改";
 				await StartFlow(update.Id, WorkflowModuleConsts.KnowledgeUpdate, EKnowledgeApplyType.Update, startDto);
-				knowledge.Status = EKnowledgeStatus.Auditing;
 			}
-			await _knowledgeRepository.UpdateAsync(knowledge, HttpContext.RequestAborted);
 		}
 
 		/// <summary>
@@ -239,8 +238,6 @@ namespace Hotline.Api.Controllers
 			}
 			else 
 			{
-				knowledge.Status = EKnowledgeStatus.Auditing;
-				await _knowledgeRepository.UpdateAsync(knowledge, HttpContext.RequestAborted);
 				var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
 				startDto.DefinitionModuleCode = WorkflowModuleConsts.KnowledgeDelete;
 				startDto.Title = "知识库删除";
@@ -728,9 +725,7 @@ namespace Hotline.Api.Controllers
 
 			dto.DefinitionModuleCode = moduleCode;
 			dto.Title = knowledge.Title;
-		    var workflowId = await _workflowApplication.StartWorkflowAsync(dto, flowId, HttpContext.RequestAborted);
-			knowledge.WorkflowId = workflowId;
-			await _knowledgeRepository.UpdateAsync(knowledge, HttpContext.RequestAborted);
+		    await _workflowApplication.StartWorkflowAsync(dto, flowId, HttpContext.RequestAborted);
 		}
 		#endregion
 

src/Hotline.Application/Handlers/FlowEngine/StartWorkflowHandler.cs

@@ -67,10 +67,10 @@ namespace Hotline.Application.Handlers.FlowEngine
                         cancellationToken: cancellationToken);
                     break;
                 case WorkflowModuleConsts.KnowledgeAdd:
-				case WorkflowModuleConsts.KnowledgeUpdate:
-				case WorkflowModuleConsts.KnowledgeDelete:
-                    //await _knowledgeDomainService.UpdateWorkFlowId(notification.FlowAssignInfo, workflow.ExternalId, workflow.Id, cancellationToken);
-                    //break;
+                case WorkflowModuleConsts.KnowledgeUpdate:
+                case WorkflowModuleConsts.KnowledgeDelete:
+                    await _knowledgeDomainService.UpdateWorkFlowId(notification.FlowAssignInfo, workflow.ExternalId, workflow.Id, cancellationToken);
+                    break;
                 case WorkflowModuleConsts.TelRestApply:
                     await _telDomainService.TelRestFlowStartAsync(notification.FlowAssignInfo, workflow.ExternalId, workflow.Id, cancellationToken);
                     break;

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -115,8 +115,8 @@ namespace Hotline.KnowledgeBase
 			var knowledge = await _knowledgeRepository.GetAsync(knowledgeFlow.KnowledgeId, cancellationToken);
 			if (knowledge == null)
 				throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeFlow.KnowledgeId}", "无效知识编号");
-			knowledge.WorkflowId = workFlowId;
-			knowledge.Status = EKnowledgeStatus.Auditing;
+            knowledge.WorkflowId = workFlowId;
+            knowledge.Status = EKnowledgeStatus.Auditing;
 			knowledge.Assign(assignInfo.FlowAssignType, assignInfo.GetHandlerIds());
 			await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
 		}