Commit e883b630a06d7db695eddb7ee123b7393e423caa
1 parent
015a941a
Exists in
master
[3790] - Implementação das Credencial de Acesso a processos e documentos
Showing
3 changed files
with
9 additions
and
8 deletions
Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/CredencialProcessoDaoHibernate.java
... | ... | @@ -3,9 +3,6 @@ package br.com.centralit.api.dao.impl; |
3 | 3 | import java.util.Collection; |
4 | 4 | import java.util.LinkedList; |
5 | 5 | |
6 | -import org.hibernate.Criteria; | |
7 | -import org.hibernate.Session; | |
8 | -import org.hibernate.criterion.Restrictions; | |
9 | 6 | import org.springframework.stereotype.Repository; |
10 | 7 | |
11 | 8 | import br.com.centralit.api.dao.CredencialProcessoDao; |
... | ... | @@ -14,9 +11,7 @@ import br.com.centralit.api.viewHelper.GrupoUsuarioVH; |
14 | 11 | import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; |
15 | 12 | import br.com.centralit.framework.dao.arquitetura.SearchSeven; |
16 | 13 | import br.com.centralit.framework.model.Grupo; |
17 | -import br.com.centralit.framework.model.Privilegio; | |
18 | 14 | import br.com.centralit.framework.model.Usuario; |
19 | -import br.com.centralit.framework.util.UtilColecao; | |
20 | 15 | import br.com.centralit.framework.util.UtilObjeto; |
21 | 16 | |
22 | 17 | /** |
... | ... | @@ -144,7 +139,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements |
144 | 139 | |
145 | 140 | return this.searchUnique(searchSeven, persistentClass); |
146 | 141 | } |
147 | - | |
142 | + | |
148 | 143 | /** |
149 | 144 | * <p> |
150 | 145 | * <b>Iniciativa(s):</b> <a href="LINK_PORTAL">NUMERO_INICIATIVA</a> |
... | ... | @@ -200,7 +195,7 @@ public class CredencialProcessoDaoHibernate extends CitGenericDAOImpl implements |
200 | 195 | |
201 | 196 | searchSeven.addFilterEqual("usuario.id", idUsuario); |
202 | 197 | |
203 | - return UtilObjeto.isReferencia(this.search(searchSeven)); | |
198 | + return UtilObjeto.isReferencia(this.searchUnique(searchSeven)); | |
204 | 199 | } |
205 | 200 | |
206 | 201 | /** | ... | ... |
cit-ecm-api/src/main/java/br/com/centralit/api/model/UnidadeProcesso.java
... | ... | @@ -9,6 +9,7 @@ import javax.persistence.ManyToOne; |
9 | 9 | |
10 | 10 | import br.com.centralit.framework.json.Views; |
11 | 11 | import br.com.centralit.framework.model.Unidade; |
12 | +import br.com.centralit.framework.model.Usuario; | |
12 | 13 | import br.com.centralit.framework.model.arquitetura.PersistentObjectAudit; |
13 | 14 | |
14 | 15 | import com.fasterxml.jackson.annotation.JsonView; |
... | ... | @@ -67,6 +68,11 @@ public class UnidadeProcesso extends PersistentObjectAudit { |
67 | 68 | @JsonView({ Views.EnviarProcessoView.class }) |
68 | 69 | private Unidade unidade; |
69 | 70 | |
71 | + /** Atributo usuarioResponsavel. */ | |
72 | + @ManyToOne(fetch = FetchType.LAZY) | |
73 | + @JsonView({ Views.EnviarProcessoView.class }) | |
74 | + private Usuario usuarioResponsavel; | |
75 | + | |
70 | 76 | /** Atributo eviarEmail. */ |
71 | 77 | @JsonView({ Views.EnviarProcessoView.class }) |
72 | 78 | private Boolean enviarEmail; | ... | ... |
cit-ecm-web/src/main/webapp/html/credencialProcesso/credencialProcesso.jsp
... | ... | @@ -73,7 +73,7 @@ |
73 | 73 | <tr ng-repeat="credencialProcesso in credenciais"> |
74 | 74 | |
75 | 75 | <td class="text-center"><i class="{{credencialProcesso.icon}}" title="{{credencialProcesso.grupo ? $translate.instant('LABEL.GRUPO') : $translate.instant('LABEL.USUARIO')}}"></i></td> |
76 | - <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}{{credencialProcesso.version}}</td> | |
76 | + <td class="text-center">{{credencialProcesso.grupo.nome}}{{credencialProcesso.usuario.username}}</td> | |
77 | 77 | <td class="text-center">{{credencialProcesso.usuario.unidade.nome}}</td> |
78 | 78 | <td class="text-center">{{credencialProcesso.permiteCredenciar ? $translate.instant('LABEL.SIM') : $translate.instant('LABEL.NAO')}}</td> |
79 | 79 | <td class="text-center"> | ... | ... |