1

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebBlacklistController.cs

@@ -42,9 +42,9 @@ namespace GxPress.Api.WebControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("list")]
-        public async Task<IEnumerable<BlacklistUser>> GetBlacklistUser()
+        public async Task<IEnumerable<BlacklistUser>> GetBlacklistUser(BlacklistUserSearchRequest request)
         {
-            var request = new BlacklistUserSearchRequest { UserId = _loginContext.AccountId };
+            request.UserId = _loginContext.AccountId;
             return await _blacklistUserRepository.GetBlacklistUserAsync(request);
         }
 

gx_api/GxPress/Model/GxPress.Request/BlacklistUser/BlacklistUserSearchRequest.cs

@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace GxPress.Request.BlacklistUser
 {
     /// <summary>
     /// 查询黑名单
     /// </summary>
-   public class BlacklistUserSearchRequest
+    public class BlacklistUserSearchRequest
     {
         /// <summary>
         /// 用户ID
         /// </summary>
         public int UserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public string KeyWord { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/BlacklistUserRepository.cs

@@ -39,7 +39,11 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<IEnumerable<BlacklistUser>> GetBlacklistUserAsync(BlacklistUserSearchRequest request)
         {
-            var result = await _repository.GetAllAsync(Q.Where(nameof(BlacklistUser.UserId), request.UserId));
+            var query = Q.NewQuery();
+            query.Where(nameof(BlacklistUser.UserId), request.UserId);
+            if (!string.IsNullOrEmpty(request.KeyWord))
+                query.WhereLike(nameof(BlacklistUser.BlackUserName), $"%{request.KeyWord}%");
+            var result = await _repository.GetAllAsync(query);
             foreach (var item in result)
                 item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
             return result;

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -139,7 +139,7 @@ namespace GxPress.Repository.Implement.Note
                             tede_user b ON a.UserId = b.Id
                         WHERE
                             a.UserId ={request.UserId} AND a.IsDraft = 1 and a.IsTopic={request.TypeValue}
-                            {sqlStr} limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
+                            {sqlStr} a.LastModifiedDate desc limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
             var result =
                 await connection
                     .QueryAsync<NoteNotFolderPageResult>(sql);

gx_api/GxPress/Service/GxPress.Service.Implement/Navigation/NavigationService.cs

@@ -151,7 +151,7 @@ namespace GxPress.Service.Implement.Navigation
                                     {
                                         Id = article.Id,
                                         Title = article.Title,
-                                        ImageUrls = string.IsNullOrEmpty(imageUrl) ? StringUtils.AddDomain(imageUrl) : "",
+                                        ImageUrls = !string.IsNullOrEmpty(imageUrl) ? StringUtils.AddDomain(imageUrl) : "",
                                         Summary = textContent,
                                         Author = article.Author,
                                         CreatedDate = article.AddDate,