|
@@ -409,7 +409,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(pagedDto.RetrievalType == null || pagedDto.RetrievalType == EKnowledgeRetrievalType.All, d => d.Title.Contains(pagedDto.Keyword) || d.Content.Contains(pagedDto.Keyword))// || d.Additions.Contains(pagedDto.Keyword)
|
|
|
.WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Title, d => d.Title.Contains(pagedDto.Keyword))
|
|
|
.WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Content, d => d.Content.Contains(pagedDto.Keyword))
|
|
|
- // .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Enclosure, d => d.Additions.Contains(pagedDto.Keyword))
|
|
|
+ // .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Enclosure, d => d.Additions.Contains(pagedDto.Keyword))
|
|
|
.OrderByDescending(p => p.PageView)
|
|
|
.ToPageListAsync(pagedDto.PageIndex, pagedDto.PageSize, total);
|
|
|
|
|
@@ -434,6 +434,7 @@ namespace Hotline.Api.Controllers
|
|
|
.Includes(it => it.Knowledge.KnowledgeType)
|
|
|
.Includes(it => it.Knowledge.HotSpotType)
|
|
|
.Includes(it => it.Workflow)
|
|
|
+ .Where(d => d.CreatorId == _sessionContext.RequiredUserId)
|
|
|
.WhereIF(pagedDto.EKnowledgeWorkFlowStatus.HasValue, d => d.WorkFlowApplyStatus == pagedDto.EKnowledgeWorkFlowStatus)
|
|
|
.WhereIF(pagedDto.StartApplyTime.HasValue, d => d.CreationTime >= pagedDto.StartApplyTime)
|
|
|
.WhereIF(pagedDto.EndApplyTime.HasValue, d => d.CreationTime <= pagedDto.EndApplyTime)
|