From 2f86e2dae18d05d7eb9ce5ab651b35f6c1cfd1e7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 6 Jun 2024 09:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9CRO=20Sponsor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Institution/CROService.cs  | 7 +++++--
 .../Service/Institution/SponsorService.cs                  | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Institution/CROService.cs b/IRaCIS.Core.Application/Service/Institution/CROService.cs
index ea1617425..b4c475a11 100644
--- a/IRaCIS.Core.Application/Service/Institution/CROService.cs
+++ b/IRaCIS.Core.Application/Service/Institution/CROService.cs
@@ -35,7 +35,10 @@ namespace IRaCIS.Application.Services
         /// <summary> 根据CRO 名称查询所有CRO 列表 </summary>
         public async Task<IEnumerable<CroSelectDTO>> GetAllCROList(Guid? trialId)
         {
-            return await _croRepository.Where(t => t.IsTrialLevel == false || t.TrialId == trialId).ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
+            return await _croRepository
+                .WhereIf(trialId == null, t => t.IsTrialLevel == false)
+                .WhereIf(trialId != null, t => t.IsTrialLevel == false || t.TrialId == trialId)
+                .ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
         }
 
 
@@ -47,7 +50,7 @@ namespace IRaCIS.Application.Services
 
             var exp = new EntityVerifyExp<CRO>()
             {
-                VerifyExp = cro =>( cro.CROName.Equals(addCroCompanyCommand.CROName) || cro.CRONameCN.Equals(addCroCompanyCommand.CRONameCN)) && cro.IsTrialLevel==false,
+                VerifyExp = cro => (cro.CROName.Equals(addCroCompanyCommand.CROName) || cro.CRONameCN.Equals(addCroCompanyCommand.CRONameCN)) && cro.IsTrialLevel == false,
                 //---已经存在同名的CRO，请确认。
                 VerifyMsg = _localizer["CRO_DupName"]
             };
diff --git a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
index f84172892..b4701ab56 100644
--- a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
+++ b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
@@ -37,7 +37,10 @@ namespace IRaCIS.Application.Services
         public async  Task<IEnumerable<SponsorSelectDTO>> GetAllSponsorList(Guid? trialId)
         {
 
-            var sponsorQueryable = _sponsorRepository.Where(t => t.IsTrialLevel == false || t.TrialId == trialId).ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
+            var sponsorQueryable = _sponsorRepository
+                .WhereIf(trialId == null, t => t.IsTrialLevel == false)
+                .WhereIf(trialId != null, t => t.IsTrialLevel == false || t.TrialId == trialId)
+                .ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
             return await sponsorQueryable.ToListAsync();
         }