@@ -21,19 +21,12 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
unit.IsActive);
|
||||
|
||||
if (filter.RegionId.HasValue)
|
||||
{
|
||||
query = query.Where(unit => unit.RegionId == filter.RegionId.Value || unit.RegionId == null);
|
||||
}
|
||||
|
||||
if (filter.EntryId.HasValue)
|
||||
{
|
||||
query = query.Where(unit => unit.EntryId == filter.EntryId.Value);
|
||||
}
|
||||
if (filter.EntryId.HasValue) query = query.Where(unit => unit.EntryId == filter.EntryId.Value);
|
||||
|
||||
if (filter.ContentNodeId.HasValue)
|
||||
{
|
||||
query = query.Where(unit => unit.ContentNodeId == filter.ContentNodeId.Value);
|
||||
}
|
||||
|
||||
query = ApplyNameKeyword(query, filter.Keyword);
|
||||
|
||||
@@ -67,20 +60,12 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
word.TenantId == filter.TenantId &&
|
||||
word.IsActive);
|
||||
|
||||
if (filter.UnitId.HasValue)
|
||||
{
|
||||
query = query.Where(word => word.UnitId == filter.UnitId.Value);
|
||||
}
|
||||
if (filter.UnitId.HasValue) query = query.Where(word => word.UnitId == filter.UnitId.Value);
|
||||
|
||||
if (filter.EntryId.HasValue)
|
||||
{
|
||||
query = query.Where(word => word.EntryId == filter.EntryId.Value);
|
||||
}
|
||||
if (filter.EntryId.HasValue) query = query.Where(word => word.EntryId == filter.EntryId.Value);
|
||||
|
||||
if (filter.ContentNodeId.HasValue)
|
||||
{
|
||||
query = query.Where(word => word.ContentNodeId == filter.ContentNodeId.Value);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(filter.Keyword))
|
||||
{
|
||||
@@ -125,19 +110,12 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
subject.IsActive);
|
||||
|
||||
if (filter.RegionId.HasValue)
|
||||
{
|
||||
query = query.Where(subject => subject.RegionId == filter.RegionId.Value || subject.RegionId == null);
|
||||
}
|
||||
|
||||
if (filter.EntryId.HasValue)
|
||||
{
|
||||
query = query.Where(subject => subject.EntryId == filter.EntryId.Value);
|
||||
}
|
||||
if (filter.EntryId.HasValue) query = query.Where(subject => subject.EntryId == filter.EntryId.Value);
|
||||
|
||||
if (filter.ContentNodeId.HasValue)
|
||||
{
|
||||
query = query.Where(subject => subject.ContentNodeId == filter.ContentNodeId.Value);
|
||||
}
|
||||
|
||||
query = ApplyNameKeyword(query, filter.Keyword);
|
||||
|
||||
@@ -175,20 +153,12 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
chapter.TenantId == filter.TenantId &&
|
||||
chapter.IsActive);
|
||||
|
||||
if (filter.SubjectId.HasValue)
|
||||
{
|
||||
query = query.Where(chapter => chapter.SubjectId == filter.SubjectId.Value);
|
||||
}
|
||||
if (filter.SubjectId.HasValue) query = query.Where(chapter => chapter.SubjectId == filter.SubjectId.Value);
|
||||
|
||||
if (filter.EntryId.HasValue)
|
||||
{
|
||||
query = query.Where(chapter => chapter.EntryId == filter.EntryId.Value);
|
||||
}
|
||||
if (filter.EntryId.HasValue) query = query.Where(chapter => chapter.EntryId == filter.EntryId.Value);
|
||||
|
||||
if (filter.ContentNodeId.HasValue)
|
||||
{
|
||||
query = query.Where(chapter => chapter.ContentNodeId == filter.ContentNodeId.Value);
|
||||
}
|
||||
|
||||
query = ApplyNameKeyword(query, filter.Keyword);
|
||||
|
||||
@@ -221,20 +191,12 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
entry.TenantId == filter.TenantId &&
|
||||
entry.IsActive);
|
||||
|
||||
if (filter.ChapterId.HasValue)
|
||||
{
|
||||
query = query.Where(entry => entry.ChapterId == filter.ChapterId.Value);
|
||||
}
|
||||
if (filter.ChapterId.HasValue) query = query.Where(entry => entry.ChapterId == filter.ChapterId.Value);
|
||||
|
||||
if (filter.EntryId.HasValue)
|
||||
{
|
||||
query = query.Where(entry => entry.EntryId == filter.EntryId.Value);
|
||||
}
|
||||
if (filter.EntryId.HasValue) query = query.Where(entry => entry.EntryId == filter.EntryId.Value);
|
||||
|
||||
if (filter.ContentNodeId.HasValue)
|
||||
{
|
||||
query = query.Where(entry => entry.ContentNodeId == filter.ContentNodeId.Value);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(filter.Keyword))
|
||||
{
|
||||
@@ -268,10 +230,7 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
private static IQueryable<T> ApplyNameKeyword<T>(IQueryable<T> query, string? keyword)
|
||||
where T : class
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(keyword))
|
||||
{
|
||||
return query;
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(keyword)) return query;
|
||||
|
||||
var trimmed = keyword.Trim();
|
||||
return query.Where(entity => EF.Property<string>(entity, "Name").Contains(trimmed));
|
||||
@@ -281,4 +240,4 @@ public sealed class StudyContentQueryService(TikuDbContext dbContext) : IStudyCo
|
||||
{
|
||||
return Math.Clamp(limit ?? DefaultLimit, 1, MaxLimit);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user