diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 9bbe68d..b245336 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -53,8 +53,31 @@ namespace BBWYB.Server.Business
                                           .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
                     select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any());
                 }
-
-                select = select.WhereIf(request.OrderState != null, (o, ocs, oct) => o.OrderState == request.OrderState)
+                if (request.OrderState != null)
+                {
+                    if (request.OrderState == Enums.OrderState.待付款 ||
+                        request.OrderState == Enums.OrderState.打包中 ||
+                        request.OrderState == Enums.OrderState.待完结 ||
+                        request.OrderState == Enums.OrderState.已完成 ||
+                        request.OrderState == Enums.OrderState.已取消)
+                    {
+                        select = select.Where((o, ocs, oct) => o.OrderState == request.OrderState);
+                    }
+                    else if (request.OrderState == Enums.OrderState.等待采购)
+                        select = select.Where((o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || o.OrderState == Enums.OrderState.部分采购);
+                }
+                select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 ||
+                                        request.OrderState == Enums.OrderState.打包中 ||
+                                        request.OrderState == Enums.OrderState.待完结 ||
+                                        request.OrderState == Enums.OrderState.已完成 ||
+                                        request.OrderState == Enums.OrderState.已取消,
+                                        (o, ocs, oct) => o.OrderState == request.OrderState)
+                               .WhereIf(request.OrderState == Enums.OrderState.等待采购, (o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 ||
+                                                                                                          o.OrderState == Enums.OrderState.部分采购)
+                               .WhereIf(request.OrderState == Enums.OrderState.待发货, (o, ocs, oct) => o.OrderState == Enums.OrderState.待发货 ||
+                                                                                                        o.OrderState == Enums.OrderState.部分发货)
+                               .WhereIf(request.OrderState == Enums.OrderState.待收货, (o, ocs, oct) => o.OrderState == Enums.OrderState.待收货 ||
+                                                                                                         o.OrderState == Enums.OrderState.部分收货)
                                .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消 && o.IsPurchased == true)
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
@@ -163,7 +186,7 @@ namespace BBWYB.Server.Business
                     foreach (var orderPurchaseInfo in order.OrderPurchaseInfoList)
                     {
                         orderPurchaseInfo.OrderPurchaseSkuInfoList = orderPurchaseSkuInfoList.Where(opsi => opsi.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
-                        orderPurchaseInfo.PurchaseExpressOrderList = purchaseExpressOrderList.Where(peo=>peo.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
+                        orderPurchaseInfo.PurchaseExpressOrderList = purchaseExpressOrderList.Where(peo => peo.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
                     }
                 }