|
@@ -1131,14 +1131,12 @@ namespace MySystem
|
|
|
UserIds.Add(int.Parse(function.CheckInt(IdString)));
|
|
|
}
|
|
|
JavaModels.WebCMSEntities db = new JavaModels.WebCMSEntities();
|
|
|
- int CampId = int.Parse(function.CheckInt(RedisDbconn.Instance.Get<string>("KxsCampUserCampId")));
|
|
|
- var users = db.KxsCampUser.Where(m => UserIds.Contains(m.UserId) && m.CampId == CampId).ToList();
|
|
|
- foreach(var user in users)
|
|
|
+ JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Status == 1);
|
|
|
+ if(camp != null)
|
|
|
{
|
|
|
- DateTime now = DateTime.Now;
|
|
|
- // JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.StartTime <= now && m.EndTime >= now);
|
|
|
- JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.Status == 1);
|
|
|
- if(camp != null)
|
|
|
+ int CampId = camp.Id;
|
|
|
+ var users = db.KxsCampUser.Where(m => UserIds.Contains(m.UserId) && m.CampId == CampId).ToList();
|
|
|
+ foreach(var user in users)
|
|
|
{
|
|
|
function.WriteLog("活动Id:" + camp.Id, "训练营判断参与活动");
|
|
|
op = false;
|