|
@@ -134,18 +134,19 @@ namespace Hotline.Api.Controllers
|
|
|
.Where(p => p.LoseEfficacyTime >= DateTime.Now)
|
|
|
.Where(p => p.IsArrive == true)
|
|
|
.Where(p => SqlFunc.JsonListObjectAny(p.PushRanges, "Key", "2"))
|
|
|
- // .Where(p => p.BulletinTypeId == dto.BulletinTypeId)
|
|
|
+ // .Where(p => p.BulletinTypeId == dto.BulletinTypeId)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.BulletinTypeId), p => p.BulletinTypeId == dto.BulletinTypeId)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.CheckChar), p => p.Content.Contains(dto.CheckChar))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.BulletinDisplayLocation), p => SqlFunc.JsonListObjectAny(p.DisplayLocation, "Key", dto.BulletinDisplayLocation))
|
|
|
.OrderByDescending(p => p.BulletinTime)
|
|
|
.Select(it => new
|
|
|
- {
|
|
|
- DataID = it.Id,
|
|
|
- it.Title,
|
|
|
- CreateDate = it.BulletinTime,
|
|
|
- it.Content
|
|
|
- })
|
|
|
+ {
|
|
|
+ DataID = it.Id,
|
|
|
+ it.Title,
|
|
|
+ CreateDate = it.BulletinTime,
|
|
|
+ it.Content,
|
|
|
+ it.BulletinTypeName
|
|
|
+ })
|
|
|
.Take(dto.Num)
|
|
|
.ToListAsync();
|
|
|
|