From a33b7d606be08ff69c3f304cb509ee50524f84da Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 23 Jan 2025 11:19:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 6695567d1..ac870d85c 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -162,14 +162,12 @@ namespace IRaCIS.Core.Application.Service //正式或者培训的项目 不能允许测试用户（必须正式用户） 同时必须是内部的用户 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false - && (t.IdentityUser.IsZhiZhun + && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC - || t.UserTypeRole.UserTypeEnum==UserTypeEnum.MIM)) + || t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM)) //测试项目 可以加入 测试用户 或者内部正式用户 - .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun - || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC - || t.UserTypeRole.UserTypeEnum == UserTypeEnum.MIM))) + .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && t.IdentityUser.IsZhiZhun)) .Where(t => userTypeEnums.Contains(t.UserTypeEnum)) .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))