1 files changed, 9 insertions(+), 6 deletions(-)

M models/user.go

@@ 232,12 232,15 @@ func (u *User) GetOrgs(ctx context.Context, perm int) ([]*Organization, error) {
 		return nil, fmt.Errorf("User object not populated")
 	}
 	opts := &database.FilterOptions{
-		Filter: sq.Or{
-			sq.Eq{"o.owner_id": u.ID},
-			sq.And{
-				sq.Eq{"ou.user_id": u.ID},
-				sq.GtOrEq{"ou.permission": perm},
-				sq.Eq{"ou.is_active": true},
+		Filter: sq.And{
+			sq.Eq{"o.is_active": true},
+			sq.Or{
+				sq.Eq{"o.owner_id": u.ID},
+				sq.And{
+					sq.Eq{"ou.user_id": u.ID},
+					sq.GtOrEq{"ou.permission": perm},
+					sq.Eq{"ou.is_active": true},
+				},
 			},
 		},
 		OrderBy: "o.id",