diff --git a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java index d031d651..878ed3fc 100644 --- a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java +++ b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java @@ -476,7 +476,7 @@ public class DbcfxFormatController extends FormatController { criterionTC1.add(Restrictions.eq(GnpgoNngDonatingDAO.HIB_PROP_CODICE_ORDINE, nngDonating.getCodiceOrdine())); List listaTC1 = new GnpgoNngDonatingDAO().findByCriteria(criterionTC1); - if(listaTC1 != null || !listaTC1.isEmpty() || listaTC1.size()>0) { + if(listaTC1 != null && !listaTC1.isEmpty() && listaTC1.size()>0) { GnpgoNngDonating tc1 = listaTC1.get(0); nngDonating.setDataEspletamento(DateUtils.toDate(notifica_nng.getDAC(),"dd/MM/yyyy")); nngDonating.setDataOrdine(tc1.getDataOrdine()); @@ -487,7 +487,7 @@ public class DbcfxFormatController extends FormatController { criterionTC3.add(Restrictions.eq(GnpgoNngDonatingDAO.HIB_PROP_CODICE_ORDINE, nngDonating.getCodiceOrdine())); List listaTC3 = new GnpgoNngDonatingDAO().findByCriteria(criterionTC3); - if(listaTC3 != null || !listaTC3.isEmpty() || listaTC3.size()>0) { + if(listaTC3 != null && !listaTC3.isEmpty() && listaTC3.size()>0) { GnpgoNngDonating tc3 = listaTC3.get(0); nngDonating.setDataEspletamento(tc3.getDac()); nngDonating.setDataOrdine(tc3.getDataOrdine());