|
@@ -91,6 +91,9 @@ public class ReportService {
|
|
if (null == dataMap.get(groupbyColumn) || !dataMap.get(groupbyColumn).equals(dataListMap.get(groupbyColumn))) {
|
|
if (null == dataMap.get(groupbyColumn) || !dataMap.get(groupbyColumn).equals(dataListMap.get(groupbyColumn))) {
|
|
bool = false;
|
|
bool = false;
|
|
}
|
|
}
|
|
|
|
+ if(null == dataMap.get(groupbyColumn) && null == dataListMap.get(groupbyColumn)){
|
|
|
|
+ bool = true;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (bool) {
|
|
if (bool) {
|
|
entity.getCalculatedColumns().addAll(datum.getCalculatedColumns());
|
|
entity.getCalculatedColumns().addAll(datum.getCalculatedColumns());
|