The present application provides an electrode assembly comprising a first electrode comprising a first current collector and a second electrode comprising a second current collector, wherein the first current collector comprises a first surface, the second current collector comprises a second surface, the first surface faces the second surface, and the second surface is provided with a conductive material. It is an object of the present application to provide an electrode assembly for improving short-circuit defects existing in the electrode assembly while ensuring resistance to mechanical abuse. The present application further provides a battery.