|
@@ -1024,7 +1024,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
AreaCode = pp.Id,
|
|
|
AreaName = pp.AreaName,
|
|
|
Count = SqlFunc.AggregateSum(dd.Count)
|
|
|
- }).Where(dd => dd.HotspotName != "").ToPivotListAsync(q => q.AreaCode, q => new { q.HotspotName, q.HotspotId }, q => q.Sum(x => x.Count));
|
|
|
+ }).MergeTable().Where(q => q.HotspotName != "").ToPivotListAsync(q => q.AreaCode, q => new { q.HotspotName, q.HotspotId }, q => q.Sum(x => x.Count));
|
|
|
|
|
|
var areaTitleList = await _systemAreaRepository.Queryable().Where(x => SqlFunc.Length(x.Id) == 6 && x.Id != "510000").OrderBy(x => x.Id).ToListAsync();
|
|
|
return (areaTitleList, returnList);
|