DuGuYang 3 лет назад
Родитель
Сommit
176b35709f
1 измененных файлов с 27 добавлено и 9 удалено
  1. 27 9
      Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

+ 27 - 9
Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -93,9 +93,18 @@ namespace MySystem.Areas.Admin.Controllers
                 // 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") + " 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;
+                var check = db.UserAccountRecord.Any(m => m.CreateDate >= start);
+                var checks = db.UserAccountRecord.Any(m => m.CreateDate <= end);
+                if (check)
+                {
+                    var sId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.UserAccountRecord.Where(m => m.CreateDate <= end).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
             }
             else
             {
@@ -104,17 +113,26 @@ namespace MySystem.Areas.Admin.Controllers
                 // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<'" + end + " 00:00:00'";
 
                 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 = function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecord.txt");
-                if (string.IsNullOrEmpty(Info.ToString()))
+                var check = db.UserAccountRecord.Any(m => m.CreateDate >= start);
+                if (check)
                 {
-                    function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
-                    condition += " and Id >=" + minId;
+                    var minId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
+                    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;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
                 }
                 else
                 {
-                    condition += " and Id >=" + Convert.ToInt32(Info);
+                    condition += " and Id =0";
                 }
+                
             }
             if (data.ChangeType > 0)
             {