diff --git a/projects/IoTCenter/Api/ProductController.cs b/projects/IoTCenter/Api/ProductController.cs index c8ed9697..d0cbba13 100644 --- a/projects/IoTCenter/Api/ProductController.cs +++ b/projects/IoTCenter/Api/ProductController.cs @@ -65,8 +65,8 @@ namespace IoTCenter.Api.Controllers model.Devices = this._deviceRepo.ReadOnlyTable() .Where(o => o.Product.Id == model.Id) .WhereIf(!string.IsNullOrWhiteSpace(organNumber), o => o.Node.OrganNodes.Any(o => o.Organ.Number == organNumber)) - .Include(o=>o.Node) - .Include(o=>o.Data) + .Include(o => o.Node) + .Include(o => o.Data) .ToList(); return Ok(model); } @@ -75,22 +75,6 @@ namespace IoTCenter.Api.Controllers ex.PrintStack(); return Problem(ex.Message); } - try - { - var model = this._nodeRepo.ReadOnlyTable() - .WhereIf(!string.IsNullOrWhiteSpace(organNumber), o => o.OrganNodes.Any(o => o.Organ.Number == organNumber)) - .Where(o => o.Devices.Any(o => o.Product.Number == number)) - .Include(o => o.Devices) - .ThenInclude(o => o.Data) - .SelectMany(o => o.Devices) - .OrderBy(o => o.NodeId).ToList(); - return Ok(model); - } - catch (Exception ex) - { - ex.PrintStack(); - return Problem(ex.Message); - } } } } \ No newline at end of file diff --git a/projects/Version.cs b/projects/Version.cs index 44228cdf..65cb1c57 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.20102401")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.20102601")] \ No newline at end of file