From 749c1daac19f4f3a894488f80c1b212e9f168d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Tue, 9 Oct 2018 21:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2defautl=20r?= =?UTF-8?q?egion=E6=97=B6guests=20count=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/cloudregions.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 6cdf658d3e..3d0e2e9a53 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -72,11 +72,13 @@ func (self *SCloudregion) GetZoneCount() int { } func (self *SCloudregion) GetGuestCount(increment bool) int { - zoneTable := ZoneManager.Query("id").Equals("cloudregion_id", self.Id) + zoneTable := ZoneManager.Query("id") if self.Id == "default" { - zoneTable = ZoneManager.Query("id").Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")), + zoneTable = zoneTable.Filter(sqlchemy.OR(sqlchemy.IsNull(zoneTable.Field("cloudregion_id")), sqlchemy.IsEmpty(zoneTable.Field("cloudregion_id")), sqlchemy.Equals(zoneTable.Field("cloudregion_id"), self.Id))) + } else { + zoneTable = zoneTable.Equals("cloudregion_id", self.Id) } sq := HostManager.Query("id").In("zone_id", zoneTable) query := GuestManager.Query().In("host_id", sq)