1

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

@@ -308,7 +308,7 @@ namespace GxPress.Repository.Implement
                                   INNER JOIN
                                 tede_department d ON d.Id = c.DepartmentId
                             WHERE
-                                a.GroupId > 0
+                                a.GroupId > 0 and a.IsDraft=0
                                     {sqlStr}
                             ORDER BY a.CreatedDate DESC limit @page,@pageSize";
             string countSql = $@"SELECT 
@@ -320,7 +320,7 @@ namespace GxPress.Repository.Implement
                                     INNER JOIN
                                 tede_user c ON c.Id = a.UserId
                             WHERE
-                                a.GroupId > 0
+                                a.GroupId > 0 and a.IsDraft=0
                                    {sqlStr}
                             ORDER BY a.CreatedDate DESC";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
@@ -469,7 +469,7 @@ namespace GxPress.Repository.Implement
                                   INNER JOIN
                                 tede_department d ON d.Id = c.DepartmentId
                             WHERE
-                                a.GroupId > 0
+                                a.GroupId > 0 and a.IsDraft=0
                                     {sqlStr}
                             ORDER BY a.CreatedDate DESC limit @page,@pageSize";
             string countSql = $@"SELECT 
@@ -481,7 +481,7 @@ namespace GxPress.Repository.Implement
                                     INNER JOIN
                                 tede_user c ON c.Id = a.UserId
                             WHERE
-                                a.GroupId > 0
+                                a.GroupId > 0  and a.IsDraft=0
                                    {sqlStr}
                             ORDER BY a.CreatedDate DESC";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);

gx_api/GxPress/Service/GxPress.Service.Implement/Note/NoteService.cs

@@ -238,6 +238,8 @@ namespace GxPress.Service.Implement.Note
         {
             var result = await _noteRepository.NotePageListAsync(request);
             result.DraftCount = await _noteRepository.GetDraftCountAsync(request.UserId, request.TypeValue == 1);
+            result.IsDraft = result.DraftCount > 0;
+            result.DraftId = await _noteRepository.GetNoteIdByDraftAsync(request.UserId, request.TypeValue == 1);
             if (request.FolderId > 0)
             {
                 var middle = await _middleRepository.GetMiddleAsync(request.FolderId);

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

@@ -380,7 +380,7 @@ namespace GxPress.Service.Implement.Topic
                                                             INNER JOIN
                                                         tede_middle c ON c.MiddleId = a.Id
                                                     WHERE 
-                                                        c.FolderType = {topicTypeValue} AND a.IsTopic = 1 and c.IsDelete=0
+                                                        c.FolderType = {topicTypeValue} AND a.IsTopic = 1 and c.IsDelete=0 and a.IsDraft=0
                                                          ";
             if (request.UserId <= 0)
             {
@@ -487,7 +487,7 @@ namespace GxPress.Service.Implement.Topic
                                                             INNER JOIN
                                                         tede_middle c ON c.MiddleId = a.Id
                                                     WHERE
-                                                        c.FolderType = {topicTypeValue} AND a.IsTopic = 1 and c.IsDelete=0";
+                                                        c.FolderType = {topicTypeValue} AND a.IsTopic = 1 and c.IsDelete=0 and a.IsDraft=0";
             if (request.UserId <= 0)
             {
                 sql += $@" AND c.ParentId IN (SELECT