Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -696,19 +696,20 @@ namespace Hotline.Application.Subscribers
             //    await _orderRepository.FileAsync(order, cancellationToken);
             //}
 
-            var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
-            switch (dto.FinishType)
-            {
-                case "0":
-                    //退回:撤回至发起人
-                    await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, dto.Opinion, current, cancellationToken);//todo think是否需要保存附件至省平台办理节点?
-                    break;
-                case "1":
-                    //办结:归档
-                    await _workflowApplication.HandleToEndAsync(current, order.WorkflowId, dto.Opinion, dto.Files,
-                        cancellationToken: cancellationToken);
-                    break;
-            }
+            //需求：退回不做任何流程上的处理，只在工单详情上展示退回审批结果
+            //var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
+            //switch (dto.FinishType)
+            //{
+            //    case "0":
+            //        //退回:撤回至发起人
+            //        await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, dto.Opinion, current, cancellationToken);//todo think是否需要保存附件至省平台办理节点?
+            //        break;
+            //    case "1":
+            //        //办结:归档
+            //        await _workflowApplication.HandleToEndAsync(current, order.WorkflowId, dto.Opinion, dto.Files,
+            //            cancellationToken: cancellationToken);
+            //        break;
+            //}
 
             //var now = DateTime.Now;
             //var handleDuration = order.StartTime.HasValue