瀏覽代碼

特提优化

田爽 5 月之前
父節點
當前提交
7112770933
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/Hotline.Api/Controllers/OrderController.cs

+ 4 - 4
src/Hotline.Api/Controllers/OrderController.cs

@@ -4074,7 +4074,7 @@ public class OrderController : BaseController
         {
             query.WhereIF(dto.QueryType is 1, d => d.IsForwarded == false)
                 .WhereIF(dto.QueryType is 2, d => d.IsForwarded == true)
-                .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.SpecialType == ESpecialType.ReTransact)
+                .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && od.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact)
                     .NotAny());
         }
 
@@ -4084,9 +4084,9 @@ public class OrderController : BaseController
                         d.Status != EOrderStatus.SpecialToUnAccept &&
                         d.Status != EOrderStatus.HandOverToUnAccept)
             .WhereIF(dto.QueryType is 3,
-                d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.SpecialType == ESpecialType.ReTransact).Any())
-            .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.DelayState == EDelayState.Examining).NotAny())
-            .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.State == ESendBackAuditState.Apply)
+                d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id  && os.IsDeleted == false && os.SpecialType == ESpecialType.ReTransact).Any())
+            .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
+            .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false  && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
             .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.StartsWith(dto.Keyword))