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

src/Hotline.Api/Controllers/FileController.cs

@@ -67,10 +67,10 @@ namespace Hotline.Api.Controllers
 		[HttpDelete]
 		public async Task Delete([FromBody] DeleteFileDto dto)
 		{
-			var file = await _fileRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
-			if (file is null)
-				throw UserFriendlyException.SameMessage("无效附件");
-			await _fileRepository.RemoveAsync(file);
+			foreach (var Id in dto.Ids)
+			{
+				await _fileRepository.RemoveAsync(x=>x.Id == Id);
+			}
 		}
 
 		/// <summary>

src/Hotline.Api/Controllers/OrderController.cs

@@ -846,7 +846,7 @@ public class OrderController : BaseController
     {
         var order = _mapper.Map<Order>(dto);
         var orderNo = await _orderDomainService.AddAsync(order, HttpContext.RequestAborted);
-        if (dto.File is { Count: > 0 }) await _file.UpdateFileAsync(dto.File, HttpContext.RequestAborted);
+        if (dto.File.Any()) await _file.AddFileAsync(dto.File, HttpContext.RequestAborted);
 		return orderNo;
     }
 

src/Hotline.Repository.SqlSugar/File/FileRepository.cs

@@ -12,7 +12,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.Repository.SqlSugar.File
 {
-	public class FileRepository : BaseRepository<Hotline.File.File>, IRepository<Hotline.File.File>, IScopeDependency
+	public class FileRepository : BaseRepository<Hotline.File.File>, IFileRepository, IScopeDependency
 	{
 		private readonly ISessionContext _sessionContext;
 		private readonly IMapper _mapper;
@@ -20,13 +20,8 @@ namespace Hotline.Repository.SqlSugar.File
 		{
 		}
 
-		public async Task UpdateFileAsync(List<FileDto> files, CancellationToken cancellationToken) {
-
-			var fileList = Queryable().Where(x => (x.Key == files[0].Key && x.Classify == files[0].Classify)).ToList();
-			if (fileList.Any())
-			{
-				RemoveNav(fileList);
-			}
+		public async Task AddFileAsync(List<FileDto> files, CancellationToken cancellationToken) 
+		{
 			foreach (FileDto file in files)
 			{
 				var model = _mapper.Map<Hotline.File.File>(file);

src/Hotline.Share/Dtos/File/FileDto.cs

@@ -67,7 +67,7 @@ namespace Hotline.Share.Dtos.File
 	}
 	public class DeleteFileDto
 	{
-		public string Id { get; set; }
+		public List<string> Ids { get; set; }
 	}
 
 	public record FileListDto : PagedKeywordRequest

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -518,7 +518,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 附件列表
         /// </summary>
-        public List<FileDto>? File { get; set; }
+        public List<FileDto> File { get; set; } = new();
     }
 
 

src/Hotline/File/IFileRepository.cs

@@ -11,6 +11,6 @@ namespace Hotline.File
 {
 	public interface IFileRepository : IRepository<File>
 	{
-		Task UpdateFileAsync(List<FileDto> order, CancellationToken cancellationToken);
+		Task AddFileAsync(List<FileDto> order, CancellationToken cancellationToken);
 	}
 }