From 818d48c2c06e884a3e6e6961ca25b07af6e5aba6 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Mon, 5 Nov 2018 10:49:56 +0100
Subject: [PATCH] always execute the user teams query

---
 pkg/services/sqlstore/user.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 6e4b12ca7c3..99a77ecabc3 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -403,17 +403,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
 	if user.OrgRole == "" {
 		user.OrgId = -1
 		user.OrgName = "Org missing"
-	} else {
-		getTeamsByUserQuery := &m.GetTeamsByUserQuery{OrgId: user.OrgId, UserId: user.UserId}
-		err = GetTeamsByUser(getTeamsByUserQuery)
-		if err != nil {
-			return err
-		}
+	}
 
-		user.Teams = make([]int64, len(getTeamsByUserQuery.Result))
-		for i, t := range getTeamsByUserQuery.Result {
-			user.Teams[i] = t.Id
-		}
+	getTeamsByUserQuery := &m.GetTeamsByUserQuery{OrgId: user.OrgId, UserId: user.UserId}
+	err = GetTeamsByUser(getTeamsByUserQuery)
+	if err != nil {
+		return err
+	}
+
+	user.Teams = make([]int64, len(getTeamsByUserQuery.Result))
+	for i, t := range getTeamsByUserQuery.Result {
+		user.Teams[i] = t.Id
 	}
 
 	query.Result = &user