diff --git a/src/main/java/org/spin/report_engine/data/ReportInfo.java b/src/main/java/org/spin/report_engine/data/ReportInfo.java index 192cb35..522963d 100644 --- a/src/main/java/org/spin/report_engine/data/ReportInfo.java +++ b/src/main/java/org/spin/report_engine/data/ReportInfo.java @@ -217,8 +217,9 @@ public ReportInfo completeInfo() { Map columnLength = new HashMap<>(); groupedRows = summaryHandler.getAsRows(); List completeRows = Stream.concat(getRows().stream(), groupedRows.stream()) - .sorted(getSortingValue(false)) - .collect(Collectors.toList()); + .sorted(getSortingValue(false)) + .collect(Collectors.toList()) + ; Language language = Language.getLoginLanguage(); rows = new ArrayList(); summaryRows = new ArrayList(); @@ -252,7 +253,17 @@ public ReportInfo completeInfo() { summaryRows.add(newRow); } }); - columns = columns.stream().map(column -> column.withColumnCharactersSize(columnLength.get(column.getPrintFormatItemId()))).collect(Collectors.toList()); + + if (columnLength == null || columnLength.isEmpty()) { + return this; + } + columns = columns.stream() + .map(column -> { + Integer columnCharactersSizeId = columnLength.get(column.getPrintFormatItemId()); + return column.withColumnCharactersSize(columnCharactersSizeId); + }) + .collect(Collectors.toList()) + ; return this; }