解决冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -2903,9 +2903,10 @@ public class OrderController : BaseController
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == false, d => d.NearlyExpiredTime < DateTime.Now && d.ExpiredTime > DateTime.Now)//即将超期 未办
             .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())
-            .WhereIF(dto.StartTime.HasValue ,d=>d.CreationTime >= dto.StartTime)
-            .WhereIF(dto.EndTime.HasValue, d=> d.CreationTime <= dto.EndTime)
+            //.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)
+            .WhereIF(dto.StartTime.HasValue ,d=>d.StartTime >= dto.StartTime)
+            .WhereIF(dto.EndTime.HasValue, d=> d.StartTime <= dto.EndTime)
 			.OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -3024,7 +3025,8 @@ public class OrderController : BaseController
             .WhereIF(dto.EndTime.HasValue, d => d.CreationTime <= 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())
+            //.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);