1

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

@@ -368,7 +368,7 @@ namespace GxPress.Repository.Implement
                                                             INNER JOIN
                                                         ccpph.tede_middle c ON c.MiddleId = a.Id
                                                     WHERE
-                                                        c.FolderType = 4 AND a.IsTopic = 1
+                                                        c.FolderType = 4 AND a.IsTopic = 1 and a.IsDelete=0
                                                             AND (a.FolderId IN (SELECT 
                                                                 MiddleId
                                                             FROM
@@ -421,7 +421,7 @@ namespace GxPress.Repository.Implement
                                                             INNER JOIN
                                                         ccpph.tede_middle c ON c.MiddleId = a.Id
                                                     WHERE
-                                                        c.FolderType = 4 AND a.IsTopic = 1
+                                                        c.FolderType = 4 AND a.IsTopic = 1 and a.IsDelete=0
                                                             AND (a.FolderId IN (SELECT 
                                                                 MiddleId
                                                             FROM

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

@@ -518,11 +518,8 @@ namespace GxPress.Service.Implement.Note
                 using (var transactionScope = new TransactionScope())
                 {
                     //修改笔记
-                    note.IsDelete = true;
-                    await _noteRepository.UpdateAsync(note);
-                    //获取middle修改middle
-                    var middle = await _middleRepository.GetMiddleAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.UserId), userId));
-                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.Id), middle.Id));
+                    await _noteRepository.DeleteAsync(Q.Where(nameof(Entity.Note.Note.Id), id));
+                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.UserId), userId));
                     transactionScope.Complete();
                 }
             }