From 857ea3616bd826fe51b910ff3032a0d922efc127 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 20 May 2022 17:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/PersonalWorkstation.cs            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 348a39adc..30430c6de 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -85,12 +85,14 @@ namespace IRaCIS.Core.Application
 
                     TotalSystemNoticeCount= _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? 0:await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum== Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
-                     .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now)
+                     
                     .CountAsync(),
 
                     NeedReadSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished
-                     && !t.NoticeUserReadList.Any(t=>t.CreateUserId==_userInfo.Id)).CountAsync(),
+                     && !t.NoticeUserReadList.Any(t=>t.CreateUserId==_userInfo.Id))
+                    .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now)
+                    .CountAsync(),
 
 
             };