From ceaa929cdd844d18c28da14c84592afdf1417648 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Sat, 5 Jan 2019 17:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E9=9D=9Eowner=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8name?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/cloudcommon/db/fetch.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg/cloudcommon/db/fetch.go b/pkg/cloudcommon/db/fetch.go
index 7168d07723..e1f398a94f 100644
--- a/pkg/cloudcommon/db/fetch.go
+++ b/pkg/cloudcommon/db/fetch.go
@@ -38,8 +38,11 @@ func FetchByName(manager IModelManager, userCred mcclient.IIdentityProvider, idS
 	}
 	q := manager.Query()
 	q = manager.FilterByName(q, idStr)
-	q = manager.FilterByOwner(q, owner)
 	count := q.Count()
+	if count > 1 {
+		q = manager.FilterByOwner(q, owner)
+		count = q.Count()
+	}
 	if count == 1 {
 		obj, err := NewModelObject(manager)
 		if err != nil {
@@ -105,8 +108,11 @@ func fetchItemByName(manager IModelManager, ctx context.Context, userCred mcclie
 		}
 	}
 	q = manager.FilterByName(q, idStr)
-	q = manager.FilterByOwner(q, manager.GetOwnerId(userCred))
 	count := q.Count()
+	if count > 1 {
+		q = manager.FilterByOwner(q, manager.GetOwnerId(userCred))
+		count = q.Count()
+	}
 	if count == 1 {
 		item, err := NewModelObject(manager)
 		if err != nil {