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 6c311a10d..86b4b4d74 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 @@ -66,8 +66,7 @@ namespace Learun.Application.OA sql.Append( @"select ruserid,COUNT(1) as srnum from LR_OA_News t left join LR_OA_NewsShouldRead s on s.newsid=t.f_newsid left join lr_base_user u on s.RUserId=u.F_UserId - WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 - and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) "); + WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 "); if (!queryParam["Year"].IsEmpty() && !queryParam["Month"].IsEmpty()) { sql.Append($" and year(t.F_ReleaseTime)='{queryParam["Year"].ToString()}' and month(t.F_ReleaseTime)='{queryParam["Month"].ToString()}'"); @@ -78,7 +77,7 @@ left join lr_base_user u on s.RUserId=u.F_UserId @" select ruserid,COUNT(1) as rnum from LR_OA_News t left join LR_OA_NewsRead r on r.newsid=t.f_newsid left join lr_base_user u on r.RUserId=u.F_UserId WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 - and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) + and DATEDIFF(HOUR,t.F_ReleaseTime,r.RTime)<=24*7 "); if (!queryParam["Year"].IsEmpty() && !queryParam["Month"].IsEmpty()) { @@ -442,8 +441,8 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}' { var keyword = "%" + queryParam["keyword"].ToString() + "%"; - strSql.Append(@" AND ( t.F_FullHead like '" + keyword + "' or t.F_Category like '" + keyword + "' or t.F_CreateUserName like '" + keyword - + "' or t.F_SourceName like'"+ keyword + "' or t.F_SourceAddress like '"+ keyword + "' )"); + strSql.Append(@" AND ( t.F_FullHead like '" + keyword + "' or t.F_Category like '" + keyword + "' or t.F_CreateUserName like '" + keyword + + "' or t.F_SourceName like'" + keyword + "' or t.F_SourceAddress like '" + keyword + "' )"); } if (!queryParam["categoryId"].IsEmpty()) {