IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1393,7 +1393,7 @@ namespace IRaCIS.Core.Application
              .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP,
              t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false
               && t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false))
-              && (t.TrialStatusStr != StaticData.TrialState.TrialStopped || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+              && t.TrialStatusStr != StaticData.TrialState.TrialStopped
               && t.IsDeleted == false)
              .WhereIf(inQuery.CriterionType != null, o => o.TrialReadingCriterionList.Any(t => t.CriterionType == inQuery.CriterionType && t.IsSigned && t.IsConfirm))
              .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialIdentityUserList.Any(t => t.IdentityUser.EMail.Contains(inQuery.PM_EMail)))

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -6,7 +6,6 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -104,13 +103,10 @@ namespace IRaCIS.Core.Application.Service
         //过滤废除的项目
         public async Task<List<TrialSelectDTO>> GetTrialSelect()
         {
-
-            List<int> userTypes = new List<int> { (int)UserTypeEnum.SuperAdmin, (int)UserTypeEnum.Admin, (int)UserTypeEnum.OP };
-
             return await _trialRepository.AsQueryable()
-                .WhereIf( !userTypes.Contains(_userInfo.UserTypeEnumInt), 
+                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, 
                 t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)) 
-                && (t.TrialStatusStr!= StaticData.TrialState.TrialStopped || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+                && t.TrialStatusStr!= StaticData.TrialState.TrialStopped 
                 && t.IsDeleted == false)
 
                 .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();