From e6310a4533d2a0d0a95c261055bf246bd136794b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 18 Apr 2025 17:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4OA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/TrialMaintenanceService.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 0c5e44e9e..d32eeac27 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -33,6 +33,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
             var query = _trialUseRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+
                 .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.User.UserName.Contains(inQuery.UserName))
 
@@ -82,7 +83,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             //之前已经选择的用户 不放在列表中，现在又要改回去 废弃
-            var query = _userRepository.Where(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin && t.UserTypeEnum !=UserTypeEnum.Admin)
+            var query = _userRepository.Where(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin && t.UserTypeEnum != UserTypeEnum.Admin && t.UserTypeEnum != UserTypeEnum.OA)
 
                  ////正式或者培训的项目  不能允许测试用户（必须正式用户）  同时必须是内部的用户
                  //.WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IsTestUser == false && t.IsZhiZhun)
@@ -93,7 +94,6 @@ namespace IRaCIS.Core.Application.Service
 
                  //.Where(t => userTypeEnums.Contains(t.UserTypeEnum))
 
-
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.FullName).Contains(inQuery.UserRealName))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.UserName.Contains(inQuery.UserName))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.OrganizationName.Contains(inQuery.OrganizationName))
@@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddTrialStaff)]
         [HttpPost]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> AddTrialUsers(TrialUserAddCommand[] userTrialCommands)
         {
@@ -137,7 +137,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [HttpPut]
         public async Task<IResponseOutput> UpdateTrialUser(UpdateTrialUserCommand updateTrialUserCommand)
@@ -175,7 +175,7 @@ namespace IRaCIS.Core.Application.Service
         /// <summary> 项目参与人员退出   其中IQC退出 回去释放工作量 </summary>
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.DeleteTrailStaff)]
         [HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         [Obsolete]
         public async Task<IResponseOutput> DeleteMaintenanceUser(Guid id, bool isDelete)