From bc7c669bce3d6cf8c1fae33af9582cbd72471bba Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 10 Oct 2022 10:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E7=89=A9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=9F=A5=E5=8F=96=E7=BB=93=E6=9E=84=E7=89=A9=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/utils/dataRange.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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