diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs index 59f89626..b512206a 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs @@ -130,17 +130,15 @@ namespace Yi.Framework.FileManager try { result = _thumbnailSharpManager.CreateThumbnailBytes(thumbnailSize: 300, imageStream: stream, imageFormat: Format.Jpeg); + if(result is null) throw new ArgumentNullException(nameof(result)); } catch { result = new byte[stream.Length]; stream.Read(result, 0, result.Length); - // 设置当前流的位置为流的开始 - stream.Seek(0, SeekOrigin.Begin); } finally { - await System.IO.File.WriteAllBytesAsync(Path.Combine(thumbnailPath, filename), result); } } diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs index 5351b2a2..2009a82c 100644 --- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs +++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs @@ -84,10 +84,11 @@ namespace Yi.BBS.Application.Forum .WhereIF(!string.IsNullOrEmpty(input.Title), x => x.Title.Contains(input.Title)) .WhereIF(input.PlateId is not null, x => x.PlateId == input.PlateId) .Where(x => x.IsTop == input.IsTop) - .OrderByIF(input.Type == QueryDiscussTypeEnum.New, x => x.CreationTime, OrderByType.Desc) - .OrderByIF(input.Type == QueryDiscussTypeEnum.Host, x => x.SeeNum, OrderByType.Desc) - .OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, x => x.AgreeNum, OrderByType.Desc) + .LeftJoin((discuss, user) => discuss.CreatorId == user.Id) + .OrderByIF(input.Type == QueryDiscussTypeEnum.New, discuss => discuss.CreationTime, OrderByType.Desc) + .OrderByIF(input.Type == QueryDiscussTypeEnum.Host, discuss => discuss.SeeNum, OrderByType.Desc) + .OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, discuss => discuss.AgreeNum, OrderByType.Desc) .Select((discuss, user) => new DiscussGetListOutputDto { Id=discuss.Id,