From 804bfd3b025097cc6f708c757fdd575ac47279f3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 13 Jul 2016 07:39:14 -0400 Subject: Fixing bug in inital load returning team member objects that had been deleted. (#3554) --- store/sql_team_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store/sql_team_store.go') diff --git a/store/sql_team_store.go b/store/sql_team_store.go index ddcaa7896..002d2a3ea 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -265,7 +265,7 @@ func (s SqlTeamStore) GetTeamsByUserId(userId string) StoreChannel { result := StoreResult{} var data []*model.Team - if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, TeamMembers WHERE TeamMembers.TeamId = Teams.Id AND TeamMembers.UserId = :UserId", map[string]interface{}{"UserId": userId}); err != nil { + if _, err := s.GetReplica().Select(&data, "SELECT Teams.* FROM Teams, TeamMembers WHERE TeamMembers.TeamId = Teams.Id AND TeamMembers.UserId = :UserId AND TeamMembers.DeleteAt = 0 AND Teams.DeleteAt = 0", map[string]interface{}{"UserId": userId}); err != nil { result.Err = model.NewLocAppError("SqlTeamStore.GetTeamsByUserId", "store.sql_team.get_all.app_error", nil, err.Error()) } -- cgit v1.2.3-1-g7c22