1

gx_api/GxPress/Repository/GxPress.Repository.Implement/AdminRepository.cs

@@ -172,9 +172,9 @@ namespace GxPress.Repository.Implement
             var query = Q.NewQuery();
             if (!string.IsNullOrEmpty(request.Keyword))
             {
-                query.WhereLike(nameof(Admin.Name), $"%{request.Keyword}%");
-                query.OrWhereLike(nameof(Admin.Account), $"%{request.Keyword}%");
-                query.OrWhereLike(nameof(Admin.Phone), $"%{request.Keyword}%");
+                query.Where(n => n.OrWhereLike(nameof(Admin.Name), $"%{request.Keyword}%")
+                .OrWhereLike(nameof(Admin.Account), $"%{request.Keyword}%")
+                .OrWhereLike(nameof(Admin.Phone), $"%{request.Keyword}%"));
             }
             pagedList.Total = await _repository.CountAsync(query);
             var list = await _repository.GetAllAsync(query);

gx_api/GxPress/Repository/GxPress.Repository.Implement/ArticleRepository.cs

@@ -84,9 +84,9 @@ namespace GxPress.Repository.Implement
             if (!string.IsNullOrEmpty(request.Keyword))
             {
                 var like = $"%{request.Keyword}%";
-                query.WhereLike(nameof(Article.Title), like)
-                    .OrWhereLike(nameof(Article.Author), like)
-                    .OrWhereLike(nameof(Article.Source), like);
+                query.Where(n => n.WhereLike(nameof(Article.Title), like)
+                   .OrWhereLike(nameof(Article.Author), like)
+                   .OrWhereLike(nameof(Article.Source), like));
             }
 
             if (request.GroupId > 0)
@@ -201,9 +201,9 @@ namespace GxPress.Repository.Implement
             if (!string.IsNullOrEmpty(keyword))
             {
                 var like = $"%{keyword}%";
-                query.WhereLike(nameof(Article.Title), like)
-                    .OrWhereLike(nameof(Article.Author), like)
-                    .OrWhereLike(nameof(Article.Source), like);
+                query.Where(n => n.WhereLike(nameof(Article.Title), like)
+                   .OrWhereLike(nameof(Article.Author), like)
+                   .OrWhereLike(nameof(Article.Source), like));
             }
             pagedList.Total = await _repository.CountAsync(query);
 

gx_api/GxPress/Repository/GxPress.Repository.Implement/CommentRepository.cs

@@ -107,8 +107,8 @@ namespace GxPress.Repository.Implement
             var query = Q.NewQuery();
             if (!string.IsNullOrEmpty(request.KeyWord))
             {
-                query.OrWhereLike(nameof(Comment.Content), $"%{request.KeyWord}%");
-                query.OrWhereLike(nameof(Comment.Title), $"%{request.KeyWord}%");
+                query.Where(n => n.OrWhereLike(nameof(Comment.Content), $"%{request.KeyWord}%").
+               OrWhereLike(nameof(Comment.Title), $"%{request.KeyWord}%"));
             }
             result.Total = await _repository.CountAsync(query);
             var commentResult = await _repository.GetAllAsync(query.ForPage(request.Page, request.PerPage));
@@ -321,7 +321,7 @@ namespace GxPress.Repository.Implement
         public async Task<bool> UpdateCommentAsync(CommentUpdateRequest request)
         {
             //判断类容是否为空
-            if (string.IsNullOrWhiteSpace(request.Content) && string.IsNullOrWhiteSpace(request.JsonContent)  && string.IsNullOrWhiteSpace(request.HtmlContent))
+            if (string.IsNullOrWhiteSpace(request.Content) && string.IsNullOrWhiteSpace(request.JsonContent) && string.IsNullOrWhiteSpace(request.HtmlContent))
                 throw new Common.Exceptions.BusinessException("评论不能为空！");
             //查询评论
             var comment = await _repository.GetAsync(request.CommentId);

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -191,8 +191,7 @@ namespace GxPress.Repository.Implement.Media
             var query = Q.NewQuery();
             if (!string.IsNullOrEmpty(request.KeyWord))
             {
-                query.OrWhereLike(nameof(Entity.tede2.Media.Media.Title), $"%{request.KeyWord}%");
-                query.OrWhereLike(nameof(Entity.tede2.Media.Media.Creator), $"%{request.KeyWord}%");
+                query.Where(n => n.OrWhereLike(nameof(Entity.tede2.Media.Media.Title), $"%{request.KeyWord}%").OrWhereLike(nameof(Entity.tede2.Media.Media.Creator), $"%{request.KeyWord}%"));
             }
             if (request.IsDelete > 0)
                 query.Where(nameof(Entity.tede2.Media.Media.IsDelete), request.IsDelete == 1);

gx_api/GxPress/Repository/GxPress.Repository.Implement/Order/OrderRepository.cs

@@ -43,7 +43,7 @@ namespace GxPress.Repository.Implement.Order
             var query = Q.NewQuery();
             if (!string.IsNullOrEmpty(request.KeyWord))
             {
-                query.WhereLike(nameof(Entity.Order.Order.OrderNumber), $"%{request.KeyWord}%").OrWhereLike(nameof(Entity.Order.Order.Explain), $"%{request.KeyWord}%");
+                query.Where(n => n.OrWhereLike(nameof(Entity.Order.Order.OrderNumber), $"%{request.KeyWord}%").OrWhereLike(nameof(Entity.Order.Order.Explain), $"%{request.KeyWord}%"));
             }
             if (request.PayWay > 0)
                 query.Where(nameof(Entity.Order.Order.PayWay), request.PayWay);

gx_api/GxPress/Repository/GxPress.Repository.Implement/Organization/OrganizationUserRepository.cs

@@ -36,8 +36,8 @@ namespace GxPress.Repository.Implement.Organization
             var query = Q.NewQuery();
             if (!string.IsNullOrEmpty(request.KeyWord))
             {
-                query.OrWhereLike(nameof(Entity.tede2.Organization.OrganizationUser.UserName), $"%request.KeyWord%");
-                query.OrWhereLike(nameof(Entity.tede2.Organization.OrganizationUser.LoginAccountNumber), $"%request.KeyWord%");
+                query.Where(n => n.OrWhereLike(nameof(Entity.tede2.Organization.OrganizationUser.UserName), $"%request.KeyWord%").
+               OrWhereLike(nameof(Entity.tede2.Organization.OrganizationUser.LoginAccountNumber), $"%request.KeyWord%"));
             }
             if (request.OrganizationId > 0)
                 query.Where(nameof(Entity.tede2.Organization.OrganizationUser.OrganizationId), request.OrganizationId);