1

gx_api/GxPress/Model/GxPress.Entity/Middle/Middle.cs

@@ -147,5 +147,11 @@ namespace GxPress.Entity.Middle
         /// <value></value>
         [DataColumn]
         public string CcUserComplete { get; set; }
+        /// <summary>
+        /// 是否撤回
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsRecall { get; set; }
     }
 }

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

@@ -376,7 +376,9 @@ namespace GxPress.Service.Implement.Notice
                 using (TransactionScope transactionScope = new TransactionScope())
                 {
                     //删除middle
-                    await _middleRepository.DeleteAsync(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), false));
+                    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), true).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));
                     //修改