diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 5eef4ff7..97057930 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java index 630a99cd..1cc3b436 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ParereGeologoLocalServiceImpl.java @@ -301,19 +301,16 @@ public class ParereGeologoLocalServiceImpl extends ParereGeologoLocalServiceBase private DynamicQuery dqInCorso() { DynamicQuery query = dynamicQuery(); -// Disjunction or = RestrictionsFactoryUtil.disjunction(); + Disjunction or = RestrictionsFactoryUtil.disjunction(); Junction and = RestrictionsFactoryUtil.conjunction(); - Junction and2 = RestrictionsFactoryUtil.conjunction(); and.add(RestrictionsFactoryUtil.eq("assegnatoreUserId", 0L)); and.add(RestrictionsFactoryUtil.isNull("dtCompilazione")); -// or.add(and); - and2.add(and); + or.add(and); and = RestrictionsFactoryUtil.conjunction(); and.add(RestrictionsFactoryUtil.ne("assegnatoreUserId", 0L)); and.add(RestrictionsFactoryUtil.isNull("dtApprovazione")); -// or.add(and); - and2.add(and); - query.add(and2); + or.add(and); + query.add(or); query.add(RestrictionsFactoryUtil.isNull("dtAnnullamento")); return query; } 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 40d0a4e5..534156e8 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=3654 - build.date=1681484891668 + build.number=3655 + build.date=1681487857951 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java index 30fbf0bb..97f73971 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/hook/struts/EditWorkflowTaskAction.java @@ -421,11 +421,11 @@ public class EditWorkflowTaskAction extends BaseStrutsPortletAction { renderResponse); } - private boolean isParereDaApprovare(Parere parere){ - return parere.getUnitaOperativa() != 0 && Validator.isNull(parere.getDtApprovazione) && Validator.isNull(parere.getDtAnnullamento()); + private boolean isParereDaApprovare(ParereGeologo parere){ + return parere.getUnitaOperativa() != 0 && Validator.isNull(parere.getDtApprovazione()) && Validator.isNull(parere.getDtAnnullamento()); } - private boolean isParereDaCompilare(Parere parere){ + private boolean isParereDaCompilare(ParereGeologo parere){ return Validator.isNull(parere.getDtCompilazione()) && Validator.isNull(parere.getDtAnnullamento()); }