From eef56df9b3ca853f7eef11703b5d2f1b1bf6adec Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Thu, 23 Sep 2021 17:52:52 +0800
Subject: [PATCH] fix(monitor): fix cloudaccount monitor query return field err

---
 pkg/monitor/models/unifiedmonitor.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/monitor/models/unifiedmonitor.go b/pkg/monitor/models/unifiedmonitor.go
index 289023dc98..2f3f485046 100644
--- a/pkg/monitor/models/unifiedmonitor.go
+++ b/pkg/monitor/models/unifiedmonitor.go
@@ -433,10 +433,10 @@ func checkQueryGroupBy(query *monitor.AlertQuery, inputQuery *monitor.MetricInpu
 	if len(query.Model.GroupBy) != 0 {
 		return
 	}
-	if query.Model.Database == monitor.METRIC_DATABASE_METER || inputQuery.Unit {
+	metricMeasurement, _ := MetricMeasurementManager.GetCache().Get(query.Model.Measurement)
+	if inputQuery.Unit || metricMeasurement == nil && query.Model.Database == monitor.METRIC_DATABASE_METER {
 		return
 	}
-	metricMeasurement, _ := MetricMeasurementManager.GetCache().Get(query.Model.Measurement)
 	tagId := ""
 	if metricMeasurement != nil {
 		tagId = monitor.MEASUREMENT_TAG_ID[metricMeasurement.ResType]