summaryrefslogtreecommitdiffstats
path: root/store/sql_team_store.go
diff options
context:
space:
mode:
Diffstat (limited to 'store/sql_team_store.go')
-rw-r--r--store/sql_team_store.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index 6a2bcc9b0..b2c872880 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -494,9 +494,14 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel {
COUNT(0)
FROM
TeamMembers
+ INNER JOIN
+ Users
+ ON
+ TeamMembers.UserId = Users.Id
WHERE
TeamId = :TeamId
- AND DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil {
+ AND TeamMembers.DeleteAt = 0
+ AND Users.DeleteAt = 0`, map[string]interface{}{"TeamId": member.TeamId}); err != nil {
result.Err = model.NewLocAppError("SqlUserStore.Save", "store.sql_user.save.member_count.app_error", nil, "teamId="+member.TeamId+", "+err.Error())
storeChannel <- result
close(storeChannel)