|
@@ -523,14 +523,15 @@ namespace Hotline.Application.Knowledge
|
|
.WhereIF(dto.StartTime.HasValue, p => p.LastModificationTime >= dto.StartTime)
|
|
.WhereIF(dto.StartTime.HasValue, p => p.LastModificationTime >= dto.StartTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.LastModificationTime <= dto.EndTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.LastModificationTime <= dto.EndTime)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.SourceOrganize.Name.Contains(dto.Keyword))
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), p => p.SourceOrganize.Name.Contains(dto.Keyword))
|
|
|
|
+ .OrderBy(p => new { p.SourceOrganize, p.LastModificationTime })
|
|
.Select(p => new KnowedgeStatisticsDto
|
|
.Select(p => new KnowedgeStatisticsDto
|
|
{
|
|
{
|
|
- Index= SqlFunc.RowNumber($"{p.LastModificationTime} desc "),
|
|
|
|
|
|
+ Index = SqlFunc.RowNumber($"{p.LastModificationTime} desc "),
|
|
LastModificationTime = p.LastModificationTime,
|
|
LastModificationTime = p.LastModificationTime,
|
|
OrgName = p.SourceOrganize.Name
|
|
OrgName = p.SourceOrganize.Name
|
|
})
|
|
})
|
|
.MergeTable()
|
|
.MergeTable()
|
|
- .Where(p=>p.Index==1)
|
|
|
|
|
|
+ .Where(p => p.Index == 1)
|
|
.OrderByDescending(p => p.LastModificationTime);
|
|
.OrderByDescending(p => p.LastModificationTime);
|
|
}
|
|
}
|
|
}
|
|
}
|