diff --git a/api/app/lib/utils/dataRange.js b/api/app/lib/utils/dataRange.js index 650ab16..a50c886 100644 --- a/api/app/lib/utils/dataRange.js +++ b/api/app/lib/utils/dataRange.js @@ -57,8 +57,8 @@ module.exports = function (app, opts) { pepProjectIds.push(b.pepProjectId) } } + // 查询项企项目的信息 - const pepProjectRes = pepProjectIds.length ? await clickHouse.projectManage.query( ` @@ -121,9 +121,16 @@ module.exports = function (app, opts) { LEFT JOIN t_project_structure ON t_project_structure.project = t_project.id + LEFT JOIN + t_project_structuregroup + ON t_project_structuregroup.project = t_project.id + LEFT JOIN + t_structuregroup_structure + ON t_structuregroup_structure.structuregroup = t_project_structuregroup.structuregroup RIGHT JOIN t_structure ON t_structure.id = t_project_structure.structure + OR t_structure.id = t_structuregroup_structure.structure WHERE project_state != -1 AND