From 731f049fc07a5e10312867561da1ba395bc34d62 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 6 Nov 2023 13:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96,?= =?UTF-8?q?=E5=AF=BC=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/resultTemplate | Bin 0 -> 7769 bytes .../Helper/ExcelExportHelper.cs | 7 ++++++- .../Service/TrialSiteUser/TrialService.cs | 6 ++++-- IRaCIS.Core.Domain.Share/User/UserType.cs | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 IRaCIS.Core.API/resultTemplate diff --git a/IRaCIS.Core.API/resultTemplate b/IRaCIS.Core.API/resultTemplate new file mode 100644 index 0000000000000000000000000000000000000000..556bbb59a02bfab12cd3d1f7e63e2bcfa0992357 GIT binary patch literal 7769 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 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Modality) == multiModalityIdSelectCount) .WhereIf(multiCriteriaSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Criterion) == multiCriteriaSelectCount) .WhereIf(multiReviewTypeSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.ReviewType) == multiReviewTypeSelectCount) - .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false) + .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin + && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false) .ProjectTo(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id , isEn_Us= _userInfo.IsEn_Us }); return await query.ToPagedListAsync(searchParam.PageIndex, searchParam.PageSize, string.IsNullOrWhiteSpace(searchParam.SortField) ? "CreateTime" : searchParam.SortField, searchParam.Asc); @@ -107,7 +108,8 @@ namespace IRaCIS.Application.Services public async Task> GetTrialSelect() { return await _trialRepository.AsQueryable().IgnoreQueryFilters() - .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) + .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt !=(int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP + , t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); } diff --git a/IRaCIS.Core.Domain.Share/User/UserType.cs b/IRaCIS.Core.Domain.Share/User/UserType.cs index a5f449f12..5d2221939 100644 --- a/IRaCIS.Core.Domain.Share/User/UserType.cs +++ b/IRaCIS.Core.Domain.Share/User/UserType.cs @@ -42,7 +42,7 @@ QA = 12, - + OP=13, SPM=20, APM=21,