|
@@ -121,8 +121,9 @@ public class FormulaTurnPoint implements FormulaStrategy {
|
|
List<Object> data = new ArrayList<>();
|
|
List<Object> data = new ArrayList<>();
|
|
for(List<TurnPoint> turnPoints:result){
|
|
for(List<TurnPoint> turnPoints:result){
|
|
data.addAll(turnPoints2ListObj(turnPoints,configMap));
|
|
data.addAll(turnPoints2ListObj(turnPoints,configMap));
|
|
- int dummyRow=rowSize-turnPoints.size()%rowSize;
|
|
|
|
- if(dummyRow!=0) {
|
|
|
|
|
|
+ int index=turnPoints.size()%rowSize;
|
|
|
|
+ int dummyRow=rowSize-index;
|
|
|
|
+ if(index!=0&&dummyRow!=0) {
|
|
data.addAll(Collections.nCopies(configMap.size() * dummyRow, StringPool.EMPTY));
|
|
data.addAll(Collections.nCopies(configMap.size() * dummyRow, StringPool.EMPTY));
|
|
}
|
|
}
|
|
}
|
|
}
|