|
@@ -221,7 +221,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
.WhereIF(dto.StartTime.HasValue, it => it.CreationTime >= dto.StartTime)
|
|
.WhereIF(dto.StartTime.HasValue, it => it.CreationTime >= dto.StartTime)
|
|
.WhereIF(dto.EndTime.HasValue, it => it.CreationTime <= dto.EndTime)
|
|
.WhereIF(dto.EndTime.HasValue, it => it.CreationTime <= dto.EndTime)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), it => it.SignerName.Contains(dto.Keyword!))
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), it => it.SignerName.Contains(dto.Keyword!))
|
|
- .GroupBy(it => new { it.SignerId, it.SignerName })
|
|
|
|
|
|
+ .GroupBy(it => new { it.CreatorId, it.CreatorName })
|
|
.Select(it => new OrderBiCentreDataListVo
|
|
.Select(it => new OrderBiCentreDataListVo
|
|
{
|
|
{
|
|
UserName = it.SignerName,
|
|
UserName = it.SignerName,
|