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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4858,9 +4858,17 @@ public class OrderController : BaseController
 	/// <param name="id"></param>
 	/// <returns></returns>
 	[HttpGet("secondary_handling/{id}")]
-	public async Task<OrderSecondaryHandling> OrderSecondaryHandlingEntity(string id)
+	public async Task<OrderSecondaryHandlingDto> OrderSecondaryHandlingEntity(string id)
 	{
-        return await _orderSecondaryHandlingApplication.Entity(id, HttpContext.RequestAborted);
+        var model = await _orderSecondaryHandlingApplication.Entity(id, HttpContext.RequestAborted);
+        var dto = _mapper.Map<OrderSecondaryHandlingDto>(model);
+		if (model.FileJson != null && model.FileJson.Any())
+		{
+			var ids = model.FileJson.Select(x => x.Id).ToList();
+			var files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
+			dto.Files = files.Where(x => x.Classify == "二次办理申请").ToList();
+		}
+		return dto;
 	}
 
 	/// <summary>

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -131,7 +131,6 @@ namespace Hotline.Application.Orders
 		/// <returns></returns>
 		public async Task AuditAsync(AuditOrderSecondaryHandlingDto dto, OrderSecondaryHandling model, CancellationToken cancellationToken)
 		{
-
 			model.State = dto.State;
 			model.AuditContent = dto.AuditContent;
 			model.AuditId = _sessionContext.UserId;