暂存

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -70,37 +70,15 @@ namespace MySystem.Areas.Admin.Controllers
             //状态
             if (!string.IsNullOrEmpty(LeaderStatusSelect))
             {
-                var leaders = db.Leaders.Select(m => new { m.UserId }).ToList();
-                var Ids = "";
                 DateTime time = DateTime.Now;
                 if (LeaderStatusSelect == "0")
                 {
-                    foreach (var item in leaders)
-                    {
-                        var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId && m.UpdateDate >= time) ?? new UserRankWhite();
-                        if (userRankWhite.Id > 0)
-                        {
-                            Ids += item.UserId + ",";
-                        }
-                    }
-                    Ids = Ids.TrimEnd(',');
-                    condition += " and UserId in (" + Ids + ")";
+                    condition += " and ExpiredDate>'" + time + "'";
                 }
                 else
                 {
-
-                    foreach (var item in leaders)
-                    {
-                        var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId && m.UpdateDate >= time) ?? new UserRankWhite();
-                        if (userRankWhite.Id > 0)
-                        {
-                            Ids += item.UserId + ",";
-                        }
-                    }
-                    Ids = Ids.TrimEnd(',');
-                    condition += " and Id in (" + Ids + ")";
+                    condition += " and ExpiredDate<='" + time + "'";
                 }
-
             }
             //首次购买时间
             if (!string.IsNullOrEmpty(CreateDateData))

wwwroot/layuiadmin/modules_main/Leaders_Admin.js

@@ -151,8 +151,8 @@ layui.config({
             , { field: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'UserIdRealName', width: 200, title: '真实姓名', sort: true }
             , { field: 'CreateDate', width: 200, title: '首次购买时间', sort: true }
-            , { field: 'UpateDate', width: 200, title: '最后购买时间', sort: true }
-            , { field: 'LeaderTimeOutDate', width: 200, title: '盟主到期时间', sort: true }
+            , { field: 'LastBuyDate', width: 200, title: '最后购买时间', sort: true }
+            , { field: 'ExpiredDate', width: 200, title: '盟主到期时间', sort: true }
             , { field: 'LeaderStatus', width: 200, title: '状态', sort: true }
             , { field: 'LeaderLevel', width: 200, title: '盟主等级', sort: true }
             , { field: 'LeaderReserve', width: 200, title: '盟主储蓄金', sort: true }