It was I and John ( ) made her angry.用that还是who?

问题描述:

It was I and John ( ) made her angry.用that还是who?

that
强调句型