From 11419d1bff051af9da9a28d6da16401339f497b2 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 23 Mar 2023 10:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=80=9A=E7=9F=A5=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=85=A5=E8=81=8C=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Notice/NoticeService.cs                     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 7d22e82ab..470cbceb9 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	
@@ -328,10 +328,10 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}'
                 strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId ");
                 strSql.Append(" left join  lr_base_user u on u.F_UserId=@userId ");
                 strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0  and t.F_EnabledMark=1 ");
-                if (userinfo.account.Contains("20"))
-                {
-                    strSql.Append(" and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) ");
-                }
+                //if (userinfo.account.Contains("20"))
+                //{
+                //    strSql.Append(" and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) ");
+                //}
 
                 strSql.Append($@" and (
 ((t.F_SendDeptId is null or len(t.F_SendDeptId)=0) and (t.F_SendPostId is null  or len(t.F_SendPostId)=0))
@@ -401,10 +401,11 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}'
                 strSql.Append(" left join  lr_base_user u on u.F_UserId=@userId ");
                 strSql.Append(" left join LR_BASE_DEPARTMENT d on d.F_DepartmentId = t.F_SendDeptId ");
                 strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0  and t.F_EnabledMark=1 ");
-                if (userinfo.account.Contains("20"))
-                {
-                    strSql.Append(" and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) ");
-                }
+                //去掉用户入职时间条件
+                //if (userinfo.account.Contains("20"))
+                //{
+                //    strSql.Append(" and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) ");
+                //}
 
                 strSql.Append($@" and (
 ((t.F_SendDeptId is null or len(t.F_SendDeptId)=0) and (t.F_SendPostId is null  or len(t.F_SendPostId)=0))