田爽 1 سال پیش
والد
کامیت
a284cbf598
2فایلهای تغییر یافته به همراه3 افزوده شده و 7 حذف شده
  1. 3 2
      src/Hotline.Repository.SqlSugar/File/FileRepository.cs
  2. 0 5
      src/Hotline.Share/Dtos/File/FileDto.cs

+ 3 - 2
src/Hotline.Repository.SqlSugar/File/FileRepository.cs

@@ -26,9 +26,10 @@ namespace Hotline.Repository.SqlSugar.File
 		public async Task<List<FileJson>> AddFileAsync(List<FileDto> files, string id,CancellationToken cancellationToken, string flowId = "") 
 		{
 			List<Hotline.File.File> newFiles =  new List<Hotline.File.File>();
-			var deleteFilesId = files.Where(x => x.Delete && !string.IsNullOrEmpty(x.Id)).Select(x=> x.Id).ToList();
+			var query = Db.Queryable<Hotline.File.File>().Where(x => x.Key == id);
+			if (!string.IsNullOrEmpty(flowId)) query.Where(x => x.FlowKey == flowId);
+			var deleteFilesId = await query.Select(x=>x.Id).ToListAsync(cancellationToken);
 			await Db.Deleteable<Hotline.File.File>().In(x=>x.Id , deleteFilesId).ExecuteCommandAsync(cancellationToken);
-			files = files.Where(x => string.IsNullOrEmpty(x.Id) && x.Delete == false).ToList();
 			foreach (FileDto file in files)
 			{
 				file.OrgName = _sessionContext.OrgName;

+ 0 - 5
src/Hotline.Share/Dtos/File/FileDto.cs

@@ -10,7 +10,6 @@ namespace Hotline.Share.Dtos.File
 	public class FileDto
 	{
 
-		public string? Id { get; set; }
 
 		/// <summary>
 		/// 附件名称
@@ -76,10 +75,6 @@ namespace Hotline.Share.Dtos.File
 		/// </summary>
 		public string? Path { get; set; }
 
-		/// <summary>
-		/// 是否删除
-		/// </summary>
-		public bool Delete { get; set; } = false;
 }
 	public class UpdateFileDto: FileDto
 	{