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(), };