diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
index b41ff6b..9394e76 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
@@ -326,14 +326,23 @@ namespace Hncore.Pass.Vpn.Controllers
         [HttpGet]
         public async Task<IActionResult> Export([FromQuery]OrderQueryRequest request)
         {
-            Expression<Func<ProductOrderEntity, bool>> expr = m => (m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete) && m.OrderType != OrderType.Refund;
+            Expression<Func<ProductOrderEntity, bool>> expr = m =>( m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete) && m.OrderType != OrderType.Refund;
             if (request.KeyWord.Has())
-            {
+            {               
                 expr = expr.And(m =>
-                   m.OrderName.Contains(request.KeyWord)
-                || m.OrderNo.Contains(request.KeyWord)
-                || m.UserName.Contains(request.KeyWord)
-                || m.PackageName.Contains(request.KeyWord));
+                  m.ProductName.Contains(request.KeyWord)
+                ||m.Accounts.Contains(request.KeyWord)               
+                ||m.OrderNo.Contains(request.KeyWord)
+                ||m.UserName.Contains(request.KeyWord)
+                ||m.PackageName.Contains(request.KeyWord));
+            }
+            if (request.ProductIds != null && request.ProductIds.Count > 0)
+            {
+                expr = expr.And(m =>request.ProductIds.Contains((int)m.ProductId));
+            }
+            if (request.PackageNames != null && request.PackageNames.Count > 0)
+            {
+                expr = expr.And(m =>request.PackageNames.Contains((string)m.PackageName));
             }
             if (request.OrderTypes != null && request.OrderTypes.Count > 0)
             {
@@ -369,6 +378,7 @@ namespace Hncore.Pass.Vpn.Controllers
                     new ExcelTitle { Property = "PaymentAmount", Title = "实付" },
                     new ExcelTitle { Property = "PayType", Title = "付款方式" , Format=(val)=>((PayType)val).GetEnumDisplayName() },
                     new ExcelTitle { Property = "TradeNo", Title = "支付流水号" },
+                    new ExcelTitle { Property = "Remark", Title = "备注" },
                 };
             var fileBytes = ExcelHelper.ExportListToExcel(data, title);