调整快捷导出

Areas/Admin/Controllers/MainServer/PreAmountRecordController.cs

@@ -334,15 +334,18 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             string condition = " where 1=1 and a.PayMode=1 and a.Sort=3";
+            string conditions = " and PayMode=1 and Sort=3";
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
                 condition += " and a.UserId in (select UserId from Users where RealName='" + UserIdRealName + "')";
+                conditions += " and UserId in (select UserId from Users where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and a.UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                conditions += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -350,15 +353,17 @@ namespace MySystem.Areas.Admin.Controllers
                 string start = datelist[0];
                 string end = datelist[1];
                 condition += " and a.CreateDate>='" + start + " 00:00:00' and a.CreateDate<='" + end + " 23:59:59'";
+                conditions += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and a.Status=" + StatusSelect;
+                conditions += " and Status=" + StatusSelect;
             }
 
             var Ids = "";
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PreAmountRecord", Fields, "Id desc", "0", 1, 20000000, condition, "", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PreAmountRecord", Fields, "Id desc", "0", 1, 20000000, conditions, "Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -657,15 +657,18 @@ namespace MySystem.Areas.Admin.Controllers
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             string condition = " where 1=1 and a.PayMode=1 and a.Sort=3";
+            string conditions = " and PayMode=1 and Sort=3";
             //创客真实姓名
             if (!string.IsNullOrEmpty(UserIdRealName))
             {
                 condition += " and a.UserId in (select UserId from Users where RealName='" + UserIdRealName + "')";
+                conditions += " and UserId in (select UserId from Users where RealName='" + UserIdRealName + "')";
             }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and a.UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                conditions += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -673,15 +676,17 @@ namespace MySystem.Areas.Admin.Controllers
                 string start = datelist[0];
                 string end = datelist[1];
                 condition += " and a.CreateDate>='" + start + " 00:00:00' and a.CreateDate<='" + end + " 23:59:59'";
+                conditions += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and a.Status=" + StatusSelect;
+                conditions += " and Status=" + StatusSelect;
             }
 
             var Ids = "";
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreHouseAmountRecord", Fields, "Id desc", "0", 1, 20000000, condition, "", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreHouseAmountRecord", Fields, "Id desc", "0", 1, 20000000, conditions, "Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {