瀏覽代碼

hotfix: 首页待办查询过滤特提条件不对

xf 10 月之前
父節點
當前提交
43090b8736
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/Hotline.Api/Controllers/OrderController.cs

+ 3 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -3017,8 +3017,9 @@ public class OrderController : BaseController
             .WhereIF(dto.EndTime.HasValue, d => d.StartTime <= dto.EndTime)
 			.Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
-			.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id).NotAny())
-			.OrderByDescending(d => d.StartTime)
+            //.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id).NotAny())
+            .Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State == 0) == false)
+            .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
         var page1 = new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));