Commit 5ca2d52d08bbdf46fe5b2aa97b717e529630f6c2
1 parent
42980fe5
Exists in
master
and in
1 other branch
[Refact] Refatorando login
Showing
1 changed file
with
29 additions
and
15 deletions
Show diff stats
rn/MdWsSeiUsuarioRN.php
@@ -149,26 +149,40 @@ class MdWsSeiUsuarioRN extends InfraRN { | @@ -149,26 +149,40 @@ class MdWsSeiUsuarioRN extends InfraRN { | ||
149 | $contexto = $contextoDTO->getNumIdContexto(); | 149 | $contexto = $contextoDTO->getNumIdContexto(); |
150 | $orgao = $orgaoDTO->getNumIdOrgao(); | 150 | $orgao = $orgaoDTO->getNumIdOrgao(); |
151 | $siglaOrgao = $orgaoDTO->getStrSigla(); | 151 | $siglaOrgao = $orgaoDTO->getStrSigla(); |
152 | + | ||
153 | + $orgaoRN = new OrgaoRN(); | ||
154 | + | ||
155 | + if(!$siglaOrgao && is_null($orgao)){ | ||
156 | + $objOrgaoDTO = new OrgaoDTO(); | ||
157 | + $objOrgaoDTO->setBolExclusaoLogica(false); | ||
158 | + $objOrgaoDTO->retNumIdOrgao(); | ||
159 | + $objOrgaoDTO->retStrSigla(); | ||
160 | + $objOrgaoDTO->setStrSigla(ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema')); | ||
161 | + /** | ||
162 | + * @var $orgaoCarregdo OrgaoDTO | ||
163 | + * Orgao da sessao do sistema | ||
164 | + */ | ||
165 | + $orgaoCarregdo = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
166 | + $orgao = $orgaoCarregdo->getNumIdOrgao(); | ||
167 | + $siglaOrgao = ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema'); | ||
168 | + } | ||
152 | if(!$siglaOrgao){ | 169 | if(!$siglaOrgao){ |
153 | - $orgaoRN = new OrgaoRN(); | ||
154 | $objOrgaoDTO = new OrgaoDTO(); | 170 | $objOrgaoDTO = new OrgaoDTO(); |
155 | $objOrgaoDTO->setBolExclusaoLogica(false); | 171 | $objOrgaoDTO->setBolExclusaoLogica(false); |
156 | $objOrgaoDTO->retNumIdOrgao(); | 172 | $objOrgaoDTO->retNumIdOrgao(); |
157 | $objOrgaoDTO->retStrSigla(); | 173 | $objOrgaoDTO->retStrSigla(); |
158 | - if(!is_null($orgao)){ | ||
159 | - $objOrgaoDTO->setNumIdOrgao($orgao); | ||
160 | - $objOrgaoDTO = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
161 | - $siglaOrgao = $objOrgaoDTO->getStrSigla(); | ||
162 | - }else{ | ||
163 | - $objOrgaoDTO->setStrSigla(ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema')); | ||
164 | - /** | ||
165 | - * @var $orgaoCarregdo OrgaoDTO | ||
166 | - * Orgao da sessao do sistema | ||
167 | - */ | ||
168 | - $orgaoCarregdo = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
169 | - $orgao = $orgaoCarregdo->getNumIdOrgao(); | ||
170 | - $siglaOrgao = ConfiguracaoSEI::getInstance()->getValor('SessaoSEI', 'SiglaOrgaoSistema'); | ||
171 | - } | 174 | + $objOrgaoDTO->setNumIdOrgao($orgao); |
175 | + $objOrgaoDTO = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
176 | + $siglaOrgao = $objOrgaoDTO->getStrSigla(); | ||
177 | + } | ||
178 | + if(is_null($orgao)){ | ||
179 | + $objOrgaoDTO = new OrgaoDTO(); | ||
180 | + $objOrgaoDTO->setBolExclusaoLogica(false); | ||
181 | + $objOrgaoDTO->retNumIdOrgao(); | ||
182 | + $objOrgaoDTO->retStrSigla(); | ||
183 | + $objOrgaoDTO->setStrSigla($siglaOrgao); | ||
184 | + $objOrgaoDTO = $orgaoRN->consultarRN1352($objOrgaoDTO); | ||
185 | + $siglaOrgao = $objOrgaoDTO->getStrSigla(); | ||
172 | } | 186 | } |
173 | 187 | ||
174 | $objSipWs = $this->retornaServicoSip(); | 188 | $objSipWs = $this->retornaServicoSip(); |