Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2025-12-10 16:22:41 +01:00
parent 92cd4b1af5 bb47dd458e
commit db1949b5b6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/order/crm/service/CrmService.java
View File

@@ -338,7 +338,7 @@ public class CrmService {
); );
HashMap<String, Object> ordineImportato = UtilityDB.executeSimpleQueryOnlyFirstRow(conn, sql); HashMap<String, Object> 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()); completeOrder.setActivityId(ordineImportato.get("activity_id").toString());
if ("S".equals(ordineImportato.get("flag_elaborato").toString())) if ("S".equals(ordineImportato.get("flag_elaborato").toString()))