diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs index f387aaaab..9eb722b87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs @@ -27,7 +27,7 @@ namespace Learun.Application.OA try { var strSql = new StringBuilder(); - strSql.Append("SELECT * FROM LR_OA_News t WHERE t.F_TypeId = 2 "); + strSql.Append("SELECT * FROM LR_OA_News t WHERE t.F_TypeId = 2 and F_DeleteMark=0 "); if (!string.IsNullOrEmpty(keyword)) { strSql.Append(" AND F_FullHead like @keyword"); @@ -87,7 +87,9 @@ namespace Learun.Application.OA var entity = db.FindEntity(x => x.F_NewsId == item); if (entity != null) { - db.Delete(entity); + entity.F_DeleteMark = 1; + db.Update(entity); + //db.Delete(entity); } } @@ -156,7 +158,7 @@ namespace Learun.Application.OA var strSql = new StringBuilder(); strSql.Append("SELECT t.*,r.RNewsId,r.RTime FROM LR_OA_News t "); strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId "); - strSql.Append(" WHERE t.F_TypeId = 2 "); + strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 "); if (!string.IsNullOrEmpty(categoryId)) { strSql.Append($" AND F_CategoryId = '{categoryId}'");