瀏覽代碼

always execute the user teams query

Marcus Efraimsson 7 年之前
父節點
當前提交
818d48c2c0
共有 1 個文件被更改,包括 10 次插入10 次删除
  1. 10 10
      pkg/services/sqlstore/user.go

+ 10 - 10
pkg/services/sqlstore/user.go

@@ -403,17 +403,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
 	if user.OrgRole == "" {
 	if user.OrgRole == "" {
 		user.OrgId = -1
 		user.OrgId = -1
 		user.OrgName = "Org missing"
 		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
 	query.Result = &user