From 774051e4a01781be4b0c2a368327eb0e35fb9c66 Mon Sep 17 00:00:00 2001 From: vincenzofariello Date: Thu, 27 Jun 2024 16:17:25 +0200 Subject: [PATCH] DBCFX_RU_363 - Offerta Open Fiber FTTH (Business): Fix TEST SVIL FASE2 --- .../gnp/systemcontroller/crm/CRMBController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/crm/CRMBController.java b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/crm/CRMBController.java index c774b564..cc429bb2 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/crm/CRMBController.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/crm/CRMBController.java @@ -268,20 +268,23 @@ public class CRMBController extends AbstractCRMController implements RecoveryIF crmbDonorOut.setDaScodare((long) ApplicationCostants.PROCESSO_DONOR.MSG_DA_NON_SCODARE); crmbDonorOut.setDataInvio(new Date()); crmbOutDAO.merge(crmbDonorOut); - - GnpRichiesteCsNpg35 richCsNpg35=richCsNpg35Dao.findById(new Long(crmbDonorOut.getCodiceSessione())); - GnpRichiesteDonor richiesta = null; - GnpRichiesteDonNatOlo richiestaDonNatOlo = null; // DBCFX_RU_363 - Offerta Open Fiber FTTH (Business) GnpRichiesteDonor82 richiesteD82 = new GnpRichiesteDonor82(); GnpRichiesteDonor82DAO daoRichiesteD82 = new GnpRichiesteDonor82DAO(); richiesteD82 = daoRichiesteD82.findByCodiceSessione(crmbDonorOut.getCodiceSessione()); + GnpRichiesteCsNpg35 richCsNpg35 = null; + if(richiesteD82 == null) + richCsNpg35 = richCsNpg35Dao.findById(new Long(crmbDonorOut.getCodiceSessione())); + + GnpRichiesteDonor richiesta = null; + GnpRichiesteDonNatOlo richiestaDonNatOlo = null; + if (richCsNpg35 == null) { richiesta = dao.findByCodiceSessione(crmbDonorOut.getCodiceSessione()); } - if (richCsNpg35 == null && richiesta == null) { + if (richCsNpg35 == null && richiesta == null && richiesteD82 == null) { richiestaDonNatOlo = donNatDao.findById(new Long(crmbDonorOut.getCodiceSessione())); }