The joke which he said made me happy

His jokes make me happy

This joke he made makes me happy

他开的玩笑，让我开心

用which，也是可以的

但是最好用that或者不用

If you accept my answer

满意，请采纳关注