1

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.Comment.cs

@@ -5,6 +5,7 @@ using Dapper;
 using Datory;
 using GxPress.Common.Tools;
 using GxPress.EnumConst;
+using GxPress.Request.Reply;
 using GxPress.Result.Reply;
 
 namespace GxPress.Service.Implement.Reply
@@ -18,8 +19,11 @@ namespace GxPress.Service.Implement.Reply
         /// 获取我收到的评论
         /// </summary>
         /// <returns></returns>
-        public async Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(int userId)
+        public async Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(ReplyRequest request)
         {
+            string sqlStr = string.Empty;
+            if (!string.IsNullOrEmpty(request.KeyWord))
+                sqlStr += $" and (a.Content like '%{request.KeyWord}%' or b.Name like '%request.KeyWord%')";
             //获取回复我的
             string sql = $@"SELECT 
                                     a.Id,
@@ -46,7 +50,7 @@ namespace GxPress.Service.Implement.Reply
                                                     tede_comment
                                                 WHERE
                                                     pid > 0)
-                                                AND userId = {userId})";
+                                                AND userId = {request.UserId}) {sqlStr}";
             var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
             var connection = database.GetConnection();
             var receipt = await connection.QueryAsync<ReplyResult>(sql);
@@ -70,7 +74,7 @@ namespace GxPress.Service.Implement.Reply
                                     tede_comment
                                 WHERE
                                     pid > 0)
-                                AND userId = {userId}";
+                                AND userId = {request.UserId}";
             var my = await connection.QueryAsync<ReplyResult>(sql);
             foreach (var item in receipt)
             {
@@ -94,8 +98,11 @@ namespace GxPress.Service.Implement.Reply
         /// 获取我回复的评论
         /// </summary>
         /// <returns></returns>
-        public async Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(int userId)
+        public async Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(ReplyRequest request)
         {
+            string sqlStr = string.Empty;
+            if (!string.IsNullOrEmpty(request.KeyWord))
+                sqlStr += $" and (a.Content like '%{request.KeyWord}%' or b.Name like '%request.KeyWord%')";
             //获取回复我的
             string sql = $@"SELECT 
                                 a.Id,
@@ -111,7 +118,7 @@ namespace GxPress.Service.Implement.Reply
                                     INNER JOIN
                                 tede_user b ON a.UserId = b.Id
                             WHERE
-                                a.pid > 0 AND a.userId = {userId}";
+                                a.pid > 0 AND a.userId = {request.UserId} {sqlStr}";
             var database = new Database(DatabaseType.MySql, ConfigHelper.GetValue("Database:ConnectionString"));
             var connection = database.GetConnection();
             var receipt = await connection.QueryAsync<ReplyResult>(sql);
@@ -136,7 +143,7 @@ namespace GxPress.Service.Implement.Reply
                                                 INNER JOIN
                                             tede_user b ON a.UserId = b.Id
                                         WHERE
-                                            a.pid > 0 AND a.userId = {userId})";
+                                            a.pid > 0 AND a.userId = {request.UserId})";
             var my = await connection.QueryAsync<ReplyResult>(sql);
             foreach (var item in receipt)
             {

gx_api/GxPress/Service/GxPress.Service.Implement/Reply/ReplyService.cs

@@ -28,9 +28,9 @@ namespace GxPress.Service.Implement.Reply
             //小组话题
             result.AddRange(await GetReplyGroupTopicResults(request));
             if (request.TypeValue == 0)
-                result.AddRange(await GetReceiptCommentResult(request.UserId));
+                result.AddRange(await GetReceiptCommentResult(request));
             else
-                result.AddRange(await GetMyReceiptCommentResult(request.UserId));
+                result.AddRange(await GetMyReceiptCommentResult(request));
             //站内信 通知
             result.AddRange(await GetReplyNoticeTopicResults(request));
             result.OrderByDescending(n => n.CreatedDate);

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.cs

@@ -507,6 +507,8 @@ namespace GxPress.Service.Implement.Topic
             // result.Total = 10;
             foreach (var item in result.Items)
             {
+                // if (string.IsNullOrEmpty(item.FolderName))
+                //     item.FolderName = "根目录";
                 if (string.IsNullOrWhiteSpace(item.UserName))
                 {
                     item.Content = "[]";

gx_api/GxPress/Service/GxPress.Service.Interface/Reply/IReplyService.cs

@@ -31,12 +31,12 @@ namespace GxPress.Service.Interface.Reply
         /// 获取我收到的评论
         /// </summary>
         /// <returns></returns>
-        Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(int userId);
+        Task<IEnumerable<ReplyResult>> GetReceiptCommentResult(ReplyRequest request);
         /// <summary>
         /// 获取我回复的评论
         /// </summary>
         /// <returns></returns>
-        Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(int userId);
+        Task<IEnumerable<ReplyResult>> GetMyReceiptCommentResult(ReplyRequest reqeust);
         Task<IEnumerable<ReplyResult>> GetCommentPraiseAsync(ReplyRequest request);
         /// <summary>
         /// 获取通知点赞