diff --git a/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
index 021d527..096b52a 100644
--- a/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+++ b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
@@ -83,18 +83,50 @@ namespace KJD_Web.BLL.WXXD
 					//2.查询 tinyint(1) 的sql 字段时，转为(status + 0) as status
 					//3.避免使用 tinyint(1) 作为字段的数据类型
 
-					sql = "SELECT o.*,(out_shipped+0) as out_shipped_int FROM erp.oms_wei_order o WHERE 1=1";
+					if (!string.IsNullOrEmpty(erp_order_id_in))
+					{
 
-					//where子句
-					sql += where;
+						sql = "SELECT o.*,(out_shipped+0) as out_shipped_int FROM erp.oms_wei_order o WHERE 1=1";
 
-					if (sort_type == "asc")
-						//sql += " ORDER BY o.create_time ASC, o.id desc";
-						sql += " ORDER BY o.create_time ASC, o.id ASC";
+						//where子句
+						sql += where;
+
+						if (sort_type == "asc")
+							//sql += " ORDER BY o.create_time ASC, o.id desc";
+							sql += " ORDER BY o.create_time ASC, o.id ASC";
+						else
+							sql += " ORDER BY o.create_time DESC, o.id DESC";
+						sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+						dt = mySql.ExecuteDataTable(sql);
+
+					}
 					else
-						sql += " ORDER BY o.create_time DESC, o.id DESC";
-					sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size;
-					dt = mySql.ExecuteDataTable(sql);
+					{
+						sql = "SELECT id FROM erp.oms_wei_order o WHERE 1=1";
+						//where子句
+						sql += where;
+						dt = mySql.ExecuteDataTable(sql);
+						if (sort_type == "asc")
+							//sql += " ORDER BY o.create_time ASC, o.id desc";
+							sql += " ORDER BY o.create_time ASC, o.id ASC";
+						else
+							sql += " ORDER BY o.create_time DESC, o.id DESC";
+						sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+						dt = mySql.ExecuteDataTable(sql);
+
+						if (dt != null && string.IsNullOrEmpty(mySql.Message))
+						{
+							var ids = string.Join(",", dt.Rows.Cast<DataRow>().Select(r => r["id"]).ToList());
+							sql = "SELECT o.*,(out_shipped+0) as out_shipped_int FROM erp.oms_wei_order o WHERE id in (" + ids + ")";
+
+							if (sort_type == "asc")
+								//sql += " ORDER BY o.create_time ASC, o.id desc";
+								sql += " ORDER BY o.create_time ASC, o.id ASC";
+							else
+								sql += " ORDER BY o.create_time DESC, o.id DESC";
+							dt = mySql.ExecuteDataTable(sql);
+						}
+					}
 				}
 
 				mySql.Close();