From 10d0066a61a722e616742282c079c166f954d5f3 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <zhaoxiangchun@yunion.cn>
Date: Thu, 12 Mar 2020 16:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmeteralartbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.设置消费日提醒时，提示名称重复。
2.查询信息时MeterAlertDetails的一些字段没有回显。
---
 pkg/monitor/models/meteralert.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/monitor/models/meteralert.go b/pkg/monitor/models/meteralert.go
index de14f5dc78..60cd9d4ff4 100644
--- a/pkg/monitor/models/meteralert.go
+++ b/pkg/monitor/models/meteralert.go
@@ -170,8 +170,8 @@ func (man *SMeterAlertManager) ValidateCreateData(
 	if err != nil {
 		return nil, err
 	}
-	data.Name = name
 	data.AlertCreateInput = alertInput
+	data.Name = name
 	return &data, nil
 }
 
@@ -540,6 +540,7 @@ func (man *SMeterAlertManager) FetchCustomizeColumns(
 		rows[i] = monitor.MeterAlertDetails{
 			AlertV1Details: v1Rows[i],
 		}
+		rows[i], _ = objs[i].(*SMeterAlert).getMoreDetails(rows[i])
 	}
 
 	return rows