diff --git a/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java b/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java index 572a341376..7a92016ea3 100644 --- a/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java +++ b/ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java @@ -338,7 +338,7 @@ public class CrmService { ); HashMap ordineImportato = UtilityDB.executeSimpleQueryOnlyFirstRow(conn, sql); - if ((ordineImportato != null || ordineImportato.get("activity_id") != null) && completeOrder.getActivityId() == null) + if (completeOrder.getActivityId() == null && ordineImportato != null && ordineImportato.get("activity_id") != null) completeOrder.setActivityId(ordineImportato.get("activity_id").toString()); if ("S".equals(ordineImportato.get("flag_elaborato").toString()))