Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -161,10 +161,11 @@ namespace IRaCIS.Core.Application.Service
             var query = _userRoleRepository.Where(t => t.UserTypeEnum != UserTypeEnum.SuperAdmin && t.IdentityUser.Status == UserStateEnum.Enable).IgnoreQueryFilters()
 
                  //正式或者培训的项目  不能允许测试用户（必须正式用户）  同时必须是内部的用户
-                 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false /*&& t.IdentityUser.IsZhiZhun*/)
+                 .WhereIf(trialType == TrialType.OfficialTrial || trialType == TrialType.Training, t => t.IdentityUser.IsTestUser == false
+                                                                                                && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC))
 
                  //测试项目 可以加入 测试用户  或者内部正式用户
-                 .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true /*|| (t.IdentityUser.IsTestUser == false && t.IdentityUser.IsZhiZhun)*/)
+                 .WhereIf(trialType == TrialType.NoneOfficial, t => t.IdentityUser.IsTestUser == true || (t.IdentityUser.IsTestUser == false && (t.IdentityUser.IsZhiZhun || t.UserTypeRole.UserTypeEnum == UserTypeEnum.IQC)))
                  .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))