From ebf53fad26ce9663ce6e4df14e4e0ecba5791ee8 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Wed, 17 Apr 2019 16:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=A0=87=E7=AD=BE=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/cloudcommon/db/metadata.go | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkg/cloudcommon/db/metadata.go b/pkg/cloudcommon/db/metadata.go
index f42c89c105..289e0aae20 100644
--- a/pkg/cloudcommon/db/metadata.go
+++ b/pkg/cloudcommon/db/metadata.go
@@ -112,19 +112,24 @@ func (manager *SMetadataManager) GetPropertyTagValuePairs(ctx context.Context, u
 	if err != nil {
 		return nil, err
 	}
-	metadatas := []SMetadata{}
-	err = sql.All(&metadatas)
+	result := &struct {
+		Total int
+		Data  []struct {
+			Key   string
+			Value string
+		}
+	}{
+		Total: 0,
+		Data: []struct {
+			Key   string
+			Value string
+		}{},
+	}
+	err = sql.All(&result.Data)
 	if err != nil {
 		return nil, err
 	}
-	result := map[string][]string{}
-	for i := 0; i < len(metadatas); i++ {
-		key, value := metadatas[i].Key, metadatas[i].Value
-		if _, ok := result[key]; !ok {
-			result[key] = []string{}
-		}
-		result[key] = append(result[key], value)
-	}
+	result.Total = len(result.Data)
 	return jsonutils.Marshal(result), nil
 }