xiugai

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -92,7 +92,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // string end = datelist[1];
                 // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
                 var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
-                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
                 var sId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
                 var eId = db.UserAccountRecord.Where(m => m.CreateDate <= end).Max(m => m.Id);
                 condition += "  and Id >=" + sId + " and Id <=" + eId;
@@ -105,13 +105,16 @@ namespace MySystem.Areas.Admin.Controllers
 
                 var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
                 var minId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
-                var Info = Convert.ToInt32(function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecord.txt"));
+                var Info = function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecord.txt");
                 if (string.IsNullOrEmpty(Info.ToString()))
                 {
                     function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
                     condition += " and Id >=" + minId;
                 }
-                condition += " and Id >=" + Info;
+                else
+                {
+                    condition += " and Id >=" + Convert.ToInt32(Info);
+                }
             }
             if (data.ChangeType > 0)
             {