修复报表存储合并一行以上且某一行没有单元格时导出Excel后面的行不显示的BUG

ureport2-core/src/main/java/com/bstek/ureport/export/excel/high/builder/ExcelBuilderDirect.java

@@ -82,9 +82,6 @@ public class ExcelBuilderDirect extends ExcelBuilder {
 	        		row=sheet.createRow(rowNumber);
 	        	}
 	        	Map<Column,com.bstek.ureport.model.Cell> colCell=cellMap.get(r);
-	        	if(colCell==null){
-	        		continue;
-	        	}
 	        	int skipCol=0;
 	        	for(int i=0;i<columnSize;i++){
 	        		Column col=columns.get(i);
@@ -101,7 +98,10 @@ public class ExcelBuilderDirect extends ExcelBuilder {
 	        			continue;
 	        		}
 	        		cell=row.createCell(colNum);
-	        		com.bstek.ureport.model.Cell cellInfo=colCell.get(col);
+	        		com.bstek.ureport.model.Cell cellInfo=null;
+	        		if(colCell!=null){
+	        			cellInfo=colCell.get(col);
+	        		}
 	        		if(cellInfo==null){
 	        			continue;
 	        		}

ureport2-core/src/main/java/com/bstek/ureport/export/excel/high/builder/ExcelBuilderWithPaging.java

@@ -86,9 +86,6 @@ public class ExcelBuilderWithPaging extends ExcelBuilder{
 		        		row=sheet.createRow(rowNumber);
 		        	}
 		        	Map<Column,com.bstek.ureport.model.Cell> colCell=cellMap.get(r);
-		        	if(colCell==null){
-		        		continue;
-		        	}
 		        	int skipCol=0;
 		        	for(int i=0;i<columnSize;i++){
 		        		Column col=columns.get(i);
@@ -105,7 +102,10 @@ public class ExcelBuilderWithPaging extends ExcelBuilder{
 		        			continue;
 		        		}
 		        		cell=row.createCell(colNum);
-		        		com.bstek.ureport.model.Cell cellInfo=colCell.get(col);
+		        		com.bstek.ureport.model.Cell cellInfo=null;
+		        		if(colCell!=null){
+		        			cellInfo=colCell.get(col);
+		        		}
 		        		if(cellInfo==null){
 		        			continue;
 		        		}