fix bug on jpa generation and jpa mapping