diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryGetListInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryGetListInput.cs index c3315605..bf0b4c36 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryGetListInput.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryGetListInput.cs @@ -16,17 +16,17 @@ public class ModelLibraryGetListInput : PagedAllResultRequestDto /// /// 供应商名称筛选 /// - public string? ProviderName { get; set; } + public List? ProviderNames { get; set; } /// /// 模型类型筛选 /// - public ModelTypeEnum? ModelType { get; set; } + public List? ModelTypes { get; set; } /// /// API类型筛选 /// - public ModelApiTypeEnum? ModelApiType { get; set; } + public List? ModelApiTypes { get; set; } /// /// 是否只显示尊享模型 diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs index 0f246e5c..1bf5ed51 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs @@ -35,12 +35,12 @@ public class ModelService : ApplicationService, IModelService .Where(x => !x.IsDeleted) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x => x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey)) - .WhereIF(!string.IsNullOrWhiteSpace(input.ProviderName), x => - x.ProviderName == input.ProviderName) - .WhereIF(input.ModelType.HasValue, x => - x.ModelType == input.ModelType.Value) - .WhereIF(input.ModelApiType.HasValue, x => - x.ModelApiType == input.ModelApiType.Value) + .WhereIF(input.ProviderNames is not null, x => + input.ProviderNames.Contains(x.ProviderName)) + .WhereIF(input.ModelTypes is not null, x => + input.ModelTypes.Contains(x.ModelType)) + .WhereIF(input.ModelApiTypes is not null, x => + input.ModelApiTypes.Contains(x.ModelApiType)) .WhereIF(input.IsPremiumOnly == true, x => x.ModelType == ModelTypeEnum.PremiumChat) .OrderBy(x => x.OrderNum) @@ -113,4 +113,4 @@ public class ModelService : ApplicationService, IModelService return Task.FromResult(options); } -} +} \ No newline at end of file