xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加置顶用户信息

Browse Source
This commit is contained in:
橙子
2023-12-22 23:32:21 +08:00
parent 35e8ed0944
commit 935f5aa529
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/DiscussService.cs
View File

@@ -105,15 +105,16 @@ namespace Yi.Framework.Bbs.Application.Services
.OrderByIF(input.Type == QueryDiscussTypeEnum.Host, discuss => discuss.SeeNum, OrderByType.Desc) .OrderByIF(input.Type == QueryDiscussTypeEnum.Host, discuss => discuss.SeeNum, OrderByType.Desc)
.OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, discuss => discuss.AgreeNum, OrderByType.Desc) .OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, discuss => discuss.AgreeNum, OrderByType.Desc)
.Select((discuss, user,info) => new DiscussGetListOutputDto .Select((discuss, user, info) => new DiscussGetListOutputDto
{ {
Id = discuss.Id, Id = discuss.Id,
IsAgree = SqlFunc.Subqueryable<AgreeEntity>().WhereIF(CurrentUser.Id != null, x => x.CreatorId == CurrentUser.Id && x.DiscussId == discuss.Id).Any(), IsAgree = SqlFunc.Subqueryable<AgreeEntity>().WhereIF(CurrentUser.Id != null, x => x.CreatorId == CurrentUser.Id && x.DiscussId == discuss.Id).Any(),
User = new BbsUserGetListOutputDto() { User = new BbsUserGetListOutputDto()
Id = user.Id, {
UserName = user.UserName, Id = user.Id,
Nick = user.Nick, UserName = user.UserName,
Nick = user.Nick,
Icon = user.Icon, Icon = user.Icon,
Level = info.Level, Level = info.Level,
UserLimit = info.UserLimit UserLimit = info.UserLimit
@@ -133,9 +134,34 @@ namespace Yi.Framework.Bbs.Application.Services
/// <returns></returns> /// <returns></returns>
public async Task<List<DiscussGetListOutputDto>> GetListTopAsync() public async Task<List<DiscussGetListOutputDto>> GetListTopAsync()
{ {
var entities = await _discussTopEntityRepository._DbQueryable.Includes(x => x.Discuss).OrderByDescending(x => x.OrderNum).ToListAsync(); var output = await _discussTopEntityRepository._DbQueryable.LeftJoin<DiscussEntity>((top, discuss) => top.DiscussId == discuss.Id)
.LeftJoin<UserEntity>((top, discuss, user) => discuss.CreatorId == user.Id)
var output = await MapToGetListOutputDtosAsync(entities.Select(x => x.Discuss).ToList()); .LeftJoin<BbsUserExtraInfoEntity>((top, discuss, user, info) => user.Id == info.UserId)
.OrderByDescending(top => top.OrderNum)
.Select((top, discuss, user, info) => new DiscussGetListOutputDto
{
Id = discuss.Id,
User = new BbsUserGetListOutputDto
{
Id = user.Id,
Name=user.Name,
Sex = user.Sex,
State = user.State,
Address = user.Address,
Age = user.Age,
CreationTime = user.CreationTime,
Level=info.Level,
Introduction = user.Introduction,
Icon= user.Icon,
Nick= user.Nick,
UserName=user.UserName,
Remark= user.Remark,
UserLimit=info.UserLimit
}
}, true)
.ToListAsync();
return output; return output;
} }

3
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/DiscussTopEntity.cs
View File

@@ -22,9 +22,6 @@ namespace Yi.Framework.Bbs.Domain.Entities
public Guid DiscussId { get; set; } public Guid DiscussId { get; set; }
[Navigate(NavigateType.OneToOne, nameof(DiscussId))]
public DiscussEntity Discuss { get; set; }
public DateTime? LastModificationTime { get; set; } public DateTime? LastModificationTime { get; set; }
} }
} }