src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -392,6 +392,7 @@ namespace Hotline.Api.Controllers
             //if (string.IsNullOrEmpty(pagedDto.Keyword))
             //    throw UserFriendlyException.SameMessage("请输入关键字");
             RefAsync<int> total = 0;
+            var Keyword = pagedDto.Keyword?.Trim();
             var temp = await _knowledgeRepository
               .Queryable()
               .Where(p => p.IsDeleted == false)
@@ -412,9 +413,9 @@ namespace Hotline.Api.Controllers
            .MergeTable()
            //取第一条数据
            .Where(d => d.index == 1 && d.Status == EKnowledgeStatus.OnShelf)
-           .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 == null || pagedDto.RetrievalType == EKnowledgeRetrievalType.All) && !string.IsNullOrEmpty(Keyword), d => d.Title.Contains(Keyword) || d.Content.Contains(Keyword))// || d.Additions.Contains(pagedDto.Keyword)
+           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Title && !string.IsNullOrEmpty(Keyword), d => d.Title.Contains(Keyword))
+           .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Content && !string.IsNullOrEmpty(Keyword), d => d.Content.Contains(Keyword))
            // .WhereIF(pagedDto.RetrievalType == EKnowledgeRetrievalType.Enclosure, d => d.Additions.Contains(pagedDto.Keyword))
            .OrderByDescending(p => p.PageView)
            .ToPageListAsync(pagedDto.PageIndex, pagedDto.PageSize, total);