diff --git a/api/app/lib/utils/dataRange.js b/api/app/lib/utils/dataRange.js index cc0a332..ea1c4c6 100644 --- a/api/app/lib/utils/dataRange.js +++ b/api/app/lib/utils/dataRange.js @@ -136,10 +136,17 @@ module.exports = function (app, opts) { LEFT JOIN t_structuregroup_structure ON t_structuregroup_structure.structuregroup = t_project_structuregroup.structuregroup + LEFT JOIN + t_project_construction + ON t_project_construction.project = t_project.id + LEFT JOIN + t_structure_site + ON t_structure_site.siteid = t_project_construction.construction RIGHT JOIN t_structure ON t_structure.id = t_project_structure.structure OR t_structure.id = t_structuregroup_structure.structure + OR t_structure.id = t_structure_site.structid WHERE project_state != -1 AND