From d7edf4ce5062692541c73c8db8bcbf22c1f25131 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Mon, 9 Jan 2023 10:29:28 +0100 Subject: [PATCH] Sync --- .../src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java | 3 +++ .../it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java index c3fceb8c..ed1edb44 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SorteggioPraticaUtil.java @@ -131,6 +131,9 @@ public class SorteggioPraticaUtil { IntPratica pratica = m.getValue(); long intPraticaId = pratica.getIntPraticaId(); DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + if (Validator.isNull(dettPratica)) { + dettPratica =DettPraticaLocalServiceUtil.getLastEditableByIntPratica(intPraticaId); + } _log.info("Pratica " + pratica.getNumeroProgetto() + " id " + pratica.getIntPraticaId() + " dettPratica " + (dettPratica == null ? 0 : dettPratica.getDettPraticaId())); ServiceContext serviceContext = new ServiceContext(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 8f79f646..319e6ff9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -685,7 +685,6 @@ public class FascicoloFePortlet extends MVCPortlet { response.sendRedirect(successURL); } else if ("domanda".equalsIgnoreCase(cmd)) { saveDatiDettPratica(dettPraticaId, request, response); - } else { throw new SystemException("operazione non gestita (" + cmd + StringPool.CLOSE_PARENTHESIS); }