diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 7601e20..20913fc 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -120,7 +120,7 @@ namespace BLL join y in db.Training_CompanyTrainingItem on x.TrainingItemCode equals y.CompanyTrainingItemCode into temp //join z in db.Training_CompanyTraining on y.CompanyTrainingId equals z.CompanyTrainingId into temp from y in temp.DefaultIfEmpty() - where t.ProjectId == projectId && t.UserId == personId + where t.ProjectId == projectId && t.UserId == personId orderby x.TrainingItemCode select new Model.TrainingRecordItemItem { @@ -129,7 +129,7 @@ namespace BLL PlanId = x.PlanId, StartTime = x.StartTime, EndTime = x.EndTime, - LearningTime = x.LearnTime, + LearningTime = x.LearnTime ?? 0, AttachTime = y.LearningTime, VideoProgress = x.VideoProgress, PersonId = x.PersonId,