From 23c928ed9e2b0fd0451f28a89e0e316fdd93add5 Mon Sep 17 00:00:00 2001 From: Mattia Gosetto Date: Wed, 15 Sep 2021 11:25:04 +0200 Subject: [PATCH] correzioni flag --- .../portos/bo/util/DocumentiPraticaUtil.java | 14 ++++++++++---- .../docroot/WEB-INF/src/service.properties | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java index 734aa7a3..9ef9af8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/DocumentiPraticaUtil.java @@ -270,10 +270,16 @@ public class DocumentiPraticaUtil { } public static boolean richiestoA24(DettPratica dettPratica) { - - return (dettPratica.getLavoriPubblici() || dettPratica.getIntervFinPub()) - && !(dettPratica.getIntervInAreaDiInteresse() || dettPratica.getIntervNonModificante() || dettPratica - .getIntervNonAssoggettabile()); + boolean ret = false; + if( + (dettPratica.getLavoriPubblici() || dettPratica.getIntervFinPub()) && + !dettPratica.getIntervInAreaDiInteresse() && + !dettPratica.getIntervNonModificante() && + !dettPratica.getIntervNonAssoggettabile() + ) + ret = true; + + return ret; } public static List getDocGeologo() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 1dbb9aa7..532b60e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=3358 - build.date=1631626664366 + build.number=3359 + build.date=1631691092406 build.auto.upgrade=true ##