1

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

@@ -803,8 +803,8 @@ namespace GxPress.Repository.Implement
         public async Task<bool> UpdateTopicTextContentAsync()
         {
             var query = Q.NewQuery();
-            query.Where(nameof(Entity.Note.Note.TextContent), "=", "");
-            query.OrderByDesc(nameof(Entity.Note.Note.CreatedDate));
+            query.Where(nameof(Entity.Topic.Topic.TextContent), "=", "");
+            query.OrderByDesc(nameof(Entity.Topic.Topic.CreatedDate));
             query.Limit(100);
             var result = await _repository.GetAllAsync(query);
             foreach (var item in result)

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

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using System.Transactions;
 using GxPress.Common.Exceptions;
 using GxPress.Common.Tools;
+using GxPress.EnumConst;
 using GxPress.Request.App.Topic;
 using GxPress.Result;
 using Newtonsoft.Json;
@@ -27,6 +28,7 @@ namespace GxPress.Service.Implement.Topic
             {
                 using (TransactionScope transactionScope = new TransactionScope())
                 {
+
                     //创建话题
                     var topic = new Entity.Topic.Topic
                     {
@@ -45,15 +47,22 @@ namespace GxPress.Service.Implement.Topic
                         foreach (var item in contentJsonData)
                         {
                             item.File = StringUtils.RemoveDomain(item.File);
+                            if (item.Type == AllTypeConst.Text.GetHashCode())
+                                topic.TextContent += item.Text;
                         }
                         topic.Content = JsonConvert.SerializeObject(contentJsonData);
                     }
+                    else
+                    {
+                        topic.TextContent = "[]";
+                        topic.Content = "[]";
+                    }
                     var topicId = await _topicRepository.InsertAsync(topic);
                     //修改话题访问量
                     await _visitService.AddVisit(request.UserId, GxPress.EnumConst.AllTypeConst.Topic.GetHashCode(), topicId);
                     result = new AppResultJson<Entity.Topic.Topic>
                     {
-                        Code = 100,
+                        Code = StatusCodeConst.SucceedCode.GetHashCode(),
                         Msg = "",
                         Success = false,
                         Data = await _topicRepository.GetAsync(topicId)
@@ -65,8 +74,8 @@ namespace GxPress.Service.Implement.Topic
             {
                 return result = new AppResultJson<Entity.Topic.Topic>
                 {
-                    Code = 100,
-                    Msg = "",
+                    Code = StatusCodeConst.ErrorCode.GetHashCode(),
+                    Msg = StatusCodeConst.ErrorMsg.GetDescriptionOriginal(),
                     Success = false,
                     Data = new Entity.Topic.Topic()
                 };

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

@@ -3,7 +3,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using GxPress.Common.Exceptions;
 using GxPress.Entity.Topic;
+using GxPress.EnumConst;
 using GxPress.Request.App.Topic;
+using GxPress.Result;
+using Newtonsoft.Json;
 
 namespace GxPress.Service.Implement.Topic
 {
@@ -23,35 +26,22 @@ namespace GxPress.Service.Implement.Topic
                 topic.Title = request.Title;
             if (!string.IsNullOrEmpty(request.Content))
             {
+                topic.TextContent = string.Empty;
                 topic.Content = request.Content;
                 topic.HtmlContent = request.HtmlContent;
+                var contentJsonData = JsonConvert.DeserializeObject<List<ContentJsonData>>(request.Content);
+                foreach (var data in contentJsonData)
+                {
+                    if (data.Type == AllTypeConst.Text.GetHashCode())
+                        topic.TextContent += data.Text;
+                }
             }
-            //获取共享文件夹成员
-            if (request.FolderId > 0)
-            {
-                var folderUsers = await _folderUserRepository.GetAllAsync(request.FolderId);
-                request.TopicAddresseeUserIds = folderUsers.Select(n => n.UserId).ToList();
-                //删除topicAddress
-                await _topicAddresseeRepository.DeletByTopicIdAsync(request.Id);
-                topic.FolderId = request.FolderId;
-            }
-            var topicAddressees = new List<TopicAddressee>();
-            //
-            request.TopicAddresseeUserIds.Add(request.UserId);
-            //创建话题讨论成员
-            foreach (var item in request.TopicAddresseeUserIds)
+            else
             {
-                //创建话题管理员
-                var topicAddressee = new TopicAddressee
-                {
-                    TopicId = request.Id,
-                    UserId = item,
-                    IsAdmin = item == request.UserId
-                };
-                topicAddressees.Add(topicAddressee);
+                topic.TextContent = "[]";
+                topic.Content = string.Empty;
+                topic.HtmlContent = string.Empty;
             }
-            //添加话题阅读成员
-            await _topicAddresseeRepository.InsertAsync(topicAddressees);
             //是否草稿
             topic.IsDraft = request.IsDraft;
             return await _topicRepository.UpdateAsync(topic);