tangjiang преди 7 месеца
родител
ревизия
5a16ec18c4
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      src/Hotline.Api/Controllers/DataSharingController.cs

+ 2 - 1
src/Hotline.Api/Controllers/DataSharingController.cs

@@ -256,6 +256,7 @@ namespace Hotline.Api.Controllers
             var list = await _orderRepository.Queryable()
                  .Where(p => p.CreationTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
                 .Where(p => p.CreationTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")))
+                .Where(p => p.AcceptTypeCode != null && p.AcceptType != null)
                 .Select(it => new
                 {
                     it.AcceptType,
@@ -310,7 +311,7 @@ namespace Hotline.Api.Controllers
                 .LeftJoin<Order>((it, o) => it.Id == o.HotspotId)
                 .Where((it, o) => o.CreationTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
                 .Where((it, o) => o.CreationTime <= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59")))
-                .Where((it, o) => o.Id != null)
+                .Where((it, o) => o.Id != null && o.HotspotId != null)
                 .GroupBy((it, o) => new { Id = it.Id.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("2")) })
                 .Select((it, o) => new
                 {