Merge pull request 'Cadastro de contratos corporativos fixes bug#AL-4276' (!212) from AL-4276_ into master
Reviewed-on: adm/ModelWeb#212 Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>master
commit
a66c110d5e
2
pom.xml
2
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ModelWeb</artifactId>
|
<artifactId>ModelWeb</artifactId>
|
||||||
<version>1.73.1</version>
|
<version>1.73.2</version>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
|
|
|
@ -104,12 +104,12 @@ public class Usuario implements Serializable, UserDetails, Auditavel<Usuario> {
|
||||||
@JoinColumn(name = "EMPLEADO_ID")
|
@JoinColumn(name = "EMPLEADO_ID")
|
||||||
private Empleado empleado;
|
private Empleado empleado;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "usuarioLog", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
@OneToMany(mappedBy = "usuarioLog", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||||
@Fetch(FetchMode.SELECT)
|
@Fetch(FetchMode.SELECT)
|
||||||
@NaoAuditar
|
@NaoAuditar
|
||||||
private List<UsuarioEmpresa> usuarioEmpresaList;
|
private List<UsuarioEmpresa> usuarioEmpresaList;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "usuario", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
@OneToMany(mappedBy = "usuario", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||||
@Fetch(FetchMode.SELECT)
|
@Fetch(FetchMode.SELECT)
|
||||||
@OrderBy("padrao desc")
|
@OrderBy("padrao desc")
|
||||||
@NaoAuditar
|
@NaoAuditar
|
||||||
|
|
Loading…
Reference in New Issue