1

gx_api/GxPress/Api/GxPress.Api/AppControllers/TopicController.cs

@@ -265,5 +265,11 @@ namespace GxPress.Api.AppControllers
         {
             return await _topicRepository.ClearDraftAsync(_loginContext.AccountId, groupId);
         }
+        [HttpGet("update/list")]
+        [AllowAnonymous]
+        public async Task<bool> UpdateTopicTextContentAsync()
+        {
+            return await _topicRepository.UpdateTopicTextContentAsync();
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Topic/Topic.cs

@@ -23,6 +23,12 @@ namespace GxPress.Entity.Topic
         /// </summary>
         [DataColumn]
         public string Content { get; set; }
+         /// <summary>
+        /// 纯文本
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string TextContent { get; set; }
         /// <summary>
         /// 内容
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/TopicRepository.cs

@@ -17,6 +17,7 @@ using GxPress.Result;
 using SqlKata;
 using GxPress.Result.Job;
 using GxPress.EnumConst;
+using Newtonsoft.Json;
 
 namespace GxPress.Repository.Implement
 {
@@ -185,7 +186,7 @@ namespace GxPress.Repository.Implement
                 $"{showKey} tede_topic a inner join tede_user b on a.UserId=b.Id inner join tede_Department c on c.Id=b.DepartmentId where a.GroupId={request.GroupId}";
             var strValue = "";
             if (!string.IsNullOrEmpty(request.Key))
-                strValue += $" and (a.Title like '%{request.Key}%' or a.Content like '%{request.Key}%' or b.Name like '%{request.Key}%')";
+                strValue += $" and (a.Title like '%{request.Key}%' or a.TextContent like '%{request.Key}%' or b.Name like '%{request.Key}%')";
             sql += $"{strValue} order by a.CreatedDate  DESC LIMIT  @page , @pageSize";
             countSql += $"{strValue}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
@@ -227,7 +228,7 @@ namespace GxPress.Repository.Implement
             if (!string.IsNullOrEmpty(request.Key))
             {
                 sqlStr += $@"AND (a.Title LIKE '%{request.Key}%'
-                          OR a.Content LIKE '%{request.Key}%')";
+                          OR a.TextContent LIKE '%{request.Key}%')";
             }
             string sql = $@"SELECT 
                                 a.Id,
@@ -390,7 +391,7 @@ namespace GxPress.Repository.Implement
             if (!string.IsNullOrEmpty(request.Key))
             {
                 sqlStr += $@"AND (a.Title LIKE '%{request.Key}%'
-                          OR a.Content LIKE '%{request.Key}%')";
+                          OR a.TextContent LIKE '%{request.Key}%')";
             }
             string sql = $@"SELECT 
                                 a.Id,
@@ -722,7 +723,7 @@ namespace GxPress.Repository.Implement
             {
                 sql += $@"  AND (c.Name LIKE '%{request.Keyword}%'
                                     OR a.Title LIKE '%{request.Keyword}%'
-                                    OR a.HtmlContent LIKE '%{request.Keyword}%')";
+                                    OR a.TextContent LIKE '%{request.Keyword}%')";
             }
             if (!string.IsNullOrEmpty(request.Sort))
                 sql += $@" ORDER BY a.ReadCount DESC";
@@ -779,7 +780,7 @@ namespace GxPress.Repository.Implement
             {
                 sql += $@"  AND (c.Name LIKE '%{request.Keyword}%'
                                     OR a.Title LIKE '%{request.Keyword}%'
-                                    OR a.HtmlContent LIKE '%{request.Keyword}%')";
+                                    OR a.TextContent LIKE '%{request.Keyword}%')";
             }
             result.Total = await connection.ExecuteScalarAsync<int>(sql);
             return result;
@@ -798,5 +799,34 @@ namespace GxPress.Repository.Implement
             query.Where(nameof(Entity.Topic.Topic.GroupId), groupId);
             return await _repository.DeleteAsync(query) > 0;
         }
+
+        public async Task<bool> UpdateTopicTextContentAsync()
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.Note.Note.TextContent), "=", "");
+            query.OrderByDesc(nameof(Entity.Note.Note.CreatedDate));
+            query.Limit(100);
+            var result = await _repository.GetAllAsync(query);
+            foreach (var item in result)
+            {
+                if (!string.IsNullOrEmpty(item.Content))
+                {
+                    var contentJsonData = JsonConvert.DeserializeObject<List<ContentJsonData>>(item.Content);
+                    foreach (var data in contentJsonData)
+                    {
+                        if (data.Type == AllTypeConst.Text.GetHashCode())
+                            item.TextContent += data.Text;
+                    }
+                    if (!string.IsNullOrEmpty(item.TextContent))
+                        await _repository.UpdateAsync(item);
+                    else
+                    {
+                        item.TextContent = "[]";
+                        await _repository.UpdateAsync(item);
+                    }
+                }
+            }
+            return true;
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -1095,7 +1095,7 @@ namespace GxPress.Repository.Implement
                                     AND a.Type = 'ApproverCheck'
                                     and c.UserId={userId}
                                     AND a.IsDone = 0
-                                    AND c.IsDelete = 0;";
+                                    AND c.IsDelete = 0";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

gx_api/GxPress/Repository/GxPress.Repository.Interface/ITopicRepository.cs

@@ -71,5 +71,6 @@ namespace GxPress.Repository.Interface
         /// <param name="groupId"></param>
         /// <returns></returns>
         Task<bool> ClearDraftAsync(int userId, int groupId);
+        Task<bool> UpdateTopicTextContentAsync();
     }
 }