lihao před 4 roky
rodič
revize
43c5db07a0

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -879,7 +879,7 @@ namespace GxPress.Repository.Implement.Note
                                     INNER JOIN
                                 tede_user b ON a.UserId = b.Id inner join tede_middle c on c.MiddleId=a.Id
                             WHERE
-                                a.IsDelete = 0 and a.IsTopic=0 AND a.UserId = {request.UserId}  and c.FolderType={noteConstValue} {sqlValue}
+                                c.IsDelete = 0 and a.IsTopic=0 AND a.UserId = {request.UserId}  and c.FolderType={noteConstValue} {sqlValue}
                             ORDER BY a.IsTop desc ,a.LastModifiedDate DESC
                             limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);

+ 1 - 2
gx_api/GxPress/Service/GxPress.Service.Implement/Note/NoteService.cs

@@ -617,8 +617,7 @@ namespace GxPress.Service.Implement.Note
                         entity.TextContent += item.Text;
                 }
                 entity.Content = JsonConvert.SerializeObject(json);
-                entity.TextContent = note.TextContent;
-
+                entity.HtmlContent = note.HtmlContent;
             }
             else
             {