1

gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs

@@ -536,7 +536,7 @@ namespace GxPress.Repository.Implement
                                         tede_user c ON b.UserId = c.Id
                                             left JOIN
                                         tede_addressee d ON d.Id = a.MiddleSonId
-                                    WHERE
+                                    WHERE a.IsRecall=0,
                                         a.UserId = {request.UserId} and a.FolderType={noticeTypeValue}
                                             {sb}
                                     ORDER BY a.IsTop desc,a.LastModifiedDate desc,a.AttributeValue desc

gx_api/GxPress/Service/GxPress.Service.Implement/Notice/NoticeService.cs

@@ -395,7 +395,7 @@ namespace GxPress.Service.Implement.Notice
                     //获取通知
                     await _noticeRepository.UpdateAsync(Q.Where(nameof(Entity.Notice.Id), id).Set(nameof(Entity.Notice.IsRecall), true));
                     //删除middle
-                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), false));
+                    await _middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), false).Set(nameof(Entity.Middle.Middle.IsRecall), true));
                     //修改为草稿箱
                     await _middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), true).Set(nameof(Entity.Middle.Middle.NoticeAddresseeType), 2));
                     //修改