diff --git a/InSituLaboratory.Service/SysStatusService.cs b/InSituLaboratory.Service/SysStatusService.cs index db15fad..f4986de 100644 --- a/InSituLaboratory.Service/SysStatusService.cs +++ b/InSituLaboratory.Service/SysStatusService.cs @@ -21,7 +21,7 @@ namespace InSituLaboratory.Service /// public IEnumerable GetSysStauts() { - return this.Set().OrderByDescending(n => n.CreateTime); + return this.Query(m => true).OrderByDescending(n => n.CreateTime).AsNoTracking(); } /// @@ -30,7 +30,7 @@ namespace InSituLaboratory.Service /// public IEnumerable GetCurrentWorkEquipment() { - return this.Set().OrderByDescending(n => n.CreateTime); + return this.Set().OrderByDescending(n => n.CreateTime).AsNoTracking(); } /// @@ -39,7 +39,7 @@ namespace InSituLaboratory.Service /// public IEnumerable GetCurrentFaultyEquipment() { - return this.Set().OrderByDescending(n => n.CreateTime); + return this.Set().OrderByDescending(n => n.CreateTime).AsNoTracking(); } diff --git a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs index a0de99a..d8f63a3 100644 --- a/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs +++ b/InSituLaboratory/ViewModels/Pages/DashboardViewModel.cs @@ -43,7 +43,7 @@ namespace InSituLaboratory.ViewModels.Pages var currentFaultylist = _sysStatusService.GetCurrentFaultyEquipment().ToList(); if (sysStatuslist.Count() != 0) { - var data = _sysStatusService.GetSysStauts().First(); + var data = _sysStatusService.GetSysStauts().FirstOrDefault(); SysStatusModel.PackagingTime = data.PackagingTime; SysStatusModel.SamplingTime = data.SamplingTime; SysStatusModel.Voltage48 = data.Voltage48;