修改导出功能

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -455,7 +455,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName)
+        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string SortSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
@@ -464,7 +464,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Sort", "0"); //品牌
 
 
-            string condition = " and Status>-1 and Sort = " + data.Sort + "";
+            string condition = " and Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -485,6 +485,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
             }
+            //品牌
+            if (!string.IsNullOrEmpty(SortSelect))
+            {
+                condition += " and Sort = " + Convert.ToInt32(SortSelect);
+            }
             if (data.Status > 0)
             {
                 if (data.Status == 2) data.Status = 0;