1

gx_api/GxPress/Model/GxPress.Result/App/Note/NoteResult.cs

@@ -21,6 +21,11 @@ namespace GxPress.Result.App.Note
         /// <value></value>
         public string Content { get; set; }
         /// <summary>
+        /// 内容
+        /// </summary>
+        /// <value></value>
+        public string HtmlContent { get; set; }
+        /// <summary>
         /// 创建时间
         /// </summary>
         /// <value></value>

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

@@ -80,7 +80,7 @@ namespace GxPress.Repository.Implement.Note
                             notePageListRequest.Content = note == null ? "" : note.Content;
                             notePageListRequest.MediaId = note == null ? 0 : note.MediaId;
                             notePageListRequest.CatalogId = note == null ? "" : note.CatalogId;
-                             notePageListRequest.ChapterId = note == null ? "" : note.ChapterId;
+                            notePageListRequest.ChapterId = note == null ? "" : note.ChapterId;
                             notePageListRequest.Name = user == null ? "" : user.Name;
                             notePageListRequest.AvatarUrl = user == null ? "" : StringUtils.AddDomainMin(user.AvatarUrl);
                             notePageListRequest.DepartmentName = department == null ? "" : department.Name;
@@ -432,6 +432,7 @@ namespace GxPress.Repository.Implement.Note
                                 a.Id,
                                 a.Title,
                                 a.Content,
+                                a.HtmlContent,
                                 a.CreatedDate,
                                 b.Name,
                                 b.AvatarUrl,
@@ -530,6 +531,7 @@ namespace GxPress.Repository.Implement.Note
                             noteTopicResult.UserName = user == null ? "" : user.Name;
                             noteTopicResult.AvatarUrl = user == null ? "" : StringUtils.AddDomainMin(user.AvatarUrl);
                             noteTopicResult.FolderId = middle == null ? 0 : middle.Id;
+                            noteTopicResult.FolderName = middle == null ? "" : middle.FolderName;
                             return noteTopicResult;
                         }, splitOn: "Id,Name,Id");
             sql = $@"SELECT