diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 46608877b..1e302c973 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -142,6 +142,7 @@ namespace IRaCIS.Core.Application list.Insert(0, sysDocStat); trialDocStat.CurrentPageData = list; + trialDocStat.TotalCount++; return trialDocStat; } diff --git a/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs b/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs index 9adda62c9..a8c8e5d60 100644 --- a/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs +++ b/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs @@ -143,11 +143,11 @@ namespace IRaCIS.Core.Domain.Share { get { - var userTypeIntStr = _accessor?.HttpContext?.User?.FindFirst(JwtIRaCISClaimType.IsAdmin); + var userType = _accessor?.HttpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeEnumInt); - if (userTypeIntStr != null && !string.IsNullOrEmpty(userTypeIntStr.Value)) + if (userType != null && !string.IsNullOrEmpty(userType.Value)) { - return userTypeIntStr.Value == true.ToString(); + return int.Parse(userType.Value)==(int)UserTypeEnum.SuperAdmin; } return false; }