From c5164ef202cf540c7d933e3bcea16ab14be9a9a5 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Fri, 27 Nov 2020 12:05:49 +0800 Subject: [PATCH] =?UTF-8?q?[SSH=E8=AE=A4=E8=AF=81]=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=9A=84=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_dao.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index 3ae07f42..6da1bdc9 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -548,6 +548,7 @@ func (this *NodeDAO) CountAllEnabledNodesWithGrantId(grantId int64) (int64, erro State(NodeStateEnabled). Where("id IN (SELECT nodeId FROM edgeNodeLogins WHERE type='ssh' AND JSON_CONTAINS(params, :grantParam))"). Param("grantParam", string(maps.Map{"grantId": grantId}.AsJSON())). + Where("clusterId IN (SELECT id FROM edgeNodeClusters WHERE state=1)"). Count() } @@ -557,6 +558,7 @@ func (this *NodeDAO) FindAllEnabledNodesWithGrantId(grantId int64) (result []*No State(NodeStateEnabled). Where("id IN (SELECT nodeId FROM edgeNodeLogins WHERE type='ssh' AND JSON_CONTAINS(params, :grantParam))"). Param("grantParam", string(maps.Map{"grantId": grantId}.AsJSON())). + Where("clusterId IN (SELECT id FROM edgeNodeClusters WHERE state=1)"). Slice(&result). DescPk(). FindAll()