田爽 vor 1 Jahr
Ursprung
Commit
567dc61645
1 geänderte Dateien mit 9 neuen und 4 gelöschten Zeilen
  1. 9 4
      src/Hotline.Api/Controllers/ArticleController.cs

+ 9 - 4
src/Hotline.Api/Controllers/ArticleController.cs

@@ -89,6 +89,7 @@ namespace Hotline.Api.Controllers
         {
             var (total, items) = await _circularRepository.Queryable()
                 .Includes(x => x.CircularReadGroups)
+                .Includes(x=>x.ExaminMan)
                 .WhereIF(!string.IsNullOrEmpty(dto.CircularTypeId), d => d.CircularTypeId == dto.CircularTypeId)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title))
                 .WhereIF(dto.CircularTimeStart.HasValue, d => d.CircularTime >= dto.CircularTimeStart)
@@ -115,7 +116,8 @@ namespace Hotline.Api.Controllers
         {
             var (total, items) = await _circularRepository.Queryable()
                 .Includes(x => x.CircularReadGroups)
-                .WhereIF(!string.IsNullOrEmpty(dto.CircularTypeId), d => d.CircularTypeId == dto.CircularTypeId)
+                .Includes(x => x.ExaminMan)
+				.WhereIF(!string.IsNullOrEmpty(dto.CircularTypeId), d => d.CircularTypeId == dto.CircularTypeId)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title))
                 .WhereIF(dto.CircularTimeStart.HasValue, d => d.CircularTime >= dto.CircularTimeStart)
                 .WhereIF(dto.CircularTimeEnd.HasValue, d => d.CircularTime <= dto.CircularTimeEnd)
@@ -136,7 +138,8 @@ namespace Hotline.Api.Controllers
         {
             var model = await _circularRepository.Queryable()
                 .Includes(x => x.CircularReadGroups)
-                .FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
+                .Includes(x => x.ExaminMan)
+				.FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
             return _mapper.Map<CircularDto>(model);
         }
 
@@ -430,7 +433,8 @@ namespace Hotline.Api.Controllers
         public async Task<PagedDto<BulletinDto>> QueryBulletinList([FromQuery] QueryBulletinListRequestDto dto)
         {
             var (total, items) = await _bulletinRepository.Queryable()
-                .WhereIF(!string.IsNullOrEmpty(dto.BulletinTypeId), d => d.BulletinTypeId == dto.BulletinTypeId)
+	            .Includes(x => x.ExaminMan)
+				.WhereIF(!string.IsNullOrEmpty(dto.BulletinTypeId), d => d.BulletinTypeId == dto.BulletinTypeId)
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title))
                 .WhereIF(dto.BulletinTimeStart.HasValue, d => d.BulletinTime >= dto.BulletinTimeStart)
                 .WhereIF(dto.BulletinTimeEnd.HasValue, d => d.BulletinTime <= dto.BulletinTimeEnd)
@@ -452,7 +456,8 @@ namespace Hotline.Api.Controllers
         public async Task<BulletinDto> BulletinEntity(string id)
         {
             var model = await _bulletinRepository.Queryable()
-                .FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
+	            .Includes(x => x.ExaminMan)
+				.FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
             return _mapper.Map<BulletinDto>(model);
         }