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

Merge tag 'Hotfix-71' into develop

Browse Source 
Finish Hotfix-71
This commit is contained in:
Marco Elefante
2024-07-15 11:44:17 +02:00
parent a4fbf3138d 3c945a4be5
commit c300dff9f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/document/data_sheet/service/DataSheetServices.java
View File

@@ -111,7 +111,7 @@ public class DataSheetServices {
List<HashMap<String, Object>> descrizioni = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), sql);
if (descrizioni != null && !descrizioni.isEmpty())
if (!descrizioni.isEmpty())
hashMaps.addAll(descrizioni);
HashMap<String, String> resultMap = new HashMap<>();
@@ -122,7 +122,7 @@ public class DataSheetServices {
}
Optional<HashMap<String, Object>> optionalMap = hashMaps.stream()
.filter(map -> UtilityHashMap.<String>getValueIfExists(map, "cod_var").equalsIgnoreCase(variable))
.filter(map -> UtilityHashMap.<String>getValueIfExists(map, "cod_var").equalsIgnoreCase(variable.endsWith("E") ? variable.substring(0, variable.length() - 1) : variable))
.findFirst();
optionalMap.ifPresent(map -> {