Commit 42980fe5d0a1c693c39850a28ffc423564abdb45
1 parent
4b9b2818
Exists in
master
and in
1 other branch
[Refact] refatorando login
Showing
1 changed file
with
10 additions
and
14 deletions
Show diff stats
rn/MdWsSeiUsuarioRN.php
@@ -150,11 +150,16 @@ class MdWsSeiUsuarioRN extends InfraRN { | @@ -150,11 +150,16 @@ class MdWsSeiUsuarioRN extends InfraRN { | ||
150 | $orgao = $orgaoDTO->getNumIdOrgao(); | 150 | $orgao = $orgaoDTO->getNumIdOrgao(); |
151 | $siglaOrgao = $orgaoDTO->getStrSigla(); | 151 | $siglaOrgao = $orgaoDTO->getStrSigla(); |
152 | if(!$siglaOrgao){ | 152 | if(!$siglaOrgao){ |
153 | - if(!$orgao){ | ||
154 | - $orgaoRN = new OrgaoRN(); | ||
155 | - $objOrgaoDTO = new OrgaoDTO(); | ||
156 | - $objOrgaoDTO->setBolExclusaoLogica(false); | ||
157 | - $objOrgaoDTO->retNumIdOrgao(); | 153 | + $orgaoRN = new OrgaoRN(); |
154 | + $objOrgaoDTO = new OrgaoDTO(); | ||
155 | + $objOrgaoDTO->setBolExclusaoLogica(false); | ||
156 | + $objOrgaoDTO->retNumIdOrgao(); | ||
157 | + $objOrgaoDTO->retStrSigla(); | ||
158 | + if(!is_null($orgao)){ | ||
159 | + $objOrgaoDTO->setNumIdOrgao($orgao); | ||
160 | + $objOrgaoDTO = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
161 | + $siglaOrgao = $objOrgaoDTO->getStrSigla(); | ||
162 | + }else{ | ||
158 | $objOrgaoDTO->setStrSigla(ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema')); | 163 | $objOrgaoDTO->setStrSigla(ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema')); |
159 | /** | 164 | /** |
160 | * @var $orgaoCarregdo OrgaoDTO | 165 | * @var $orgaoCarregdo OrgaoDTO |
@@ -164,15 +169,6 @@ class MdWsSeiUsuarioRN extends InfraRN { | @@ -164,15 +169,6 @@ class MdWsSeiUsuarioRN extends InfraRN { | ||
164 | $orgao = $orgaoCarregdo->getNumIdOrgao(); | 169 | $orgao = $orgaoCarregdo->getNumIdOrgao(); |
165 | $siglaOrgao = ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema'); | 170 | $siglaOrgao = ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema'); |
166 | } | 171 | } |
167 | - if(!$siglaOrgao){ | ||
168 | - $orgaoRN = new OrgaoRN(); | ||
169 | - $objOrgaoDTO = new OrgaoDTO(); | ||
170 | - $objOrgaoDTO->setBolExclusaoLogica(false); | ||
171 | - $objOrgaoDTO->retStrSigla(); | ||
172 | - $objOrgaoDTO->setNumIdOrgao($orgao); | ||
173 | - $objOrgaoDTO = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
174 | - $siglaOrgao = $objOrgaoDTO->getStrSigla(); | ||
175 | - } | ||
176 | } | 172 | } |
177 | 173 | ||
178 | $objSipWs = $this->retornaServicoSip(); | 174 | $objSipWs = $this->retornaServicoSip(); |