Download as
Browse Code »

Commit 31536384f9f5e38032340c162af715809f6c1301

Authored by erick.sato
1 parent d567b119
Exists in master

Redmine #4698 Validação nullpointer grupo

Showing 1 changed file with 8 additions and 6 deletions   Show diff stats
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
  Diff comments   View file @3153638
... ... @@ -839,13 +839,15 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
839 839 }else{
840 840 boolean grupoMasterJaAddUser = false;
841 841 for (GrupoUsuario gpUsuario : usuario.getGrupoUsuarios()) {
842   - Grupo gp = this.grupoService.getReference(gpUsuario.getGrupo().getId());
843   - if(gp.getNome().equalsIgnoreCase("Administrador")){
844   - if(!gp.getIsMaster()){
845   - gp.setIsMaster(Boolean.TRUE);
846   - this.grupoService.merge(grupo);
  842 + if(gpUsuario.getGrupo() != null){
  843 + Grupo gp = this.grupoService.getReference(gpUsuario.getGrupo().getId());
  844 + if(gp.getNome().equalsIgnoreCase("Administrador")){
  845 + if(!gp.getIsMaster()){
  846 + gp.setIsMaster(Boolean.TRUE);
  847 + this.grupoService.merge(grupo);
  848 + }
  849 + grupoMasterJaAddUser = true;
847 850 }
848   - grupoMasterJaAddUser = true;
849 851 }
850 852 }
851 853 if(!grupoMasterJaAddUser){
... ...