Commit a9d872c6 authored by yanzg's avatar yanzg

合并空行BUG

parent 0283f959
......@@ -74,7 +74,8 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> {
File fileRow = new File(fileNameRow);
boolean ok = file.exists();
if (ok && config.getExportType() != ExportData.EXPORT_TYPE_WAIT) {
boolean isDown = ok && config.getExportType() != ExportData.EXPORT_TYPE_WAIT;
if (isDown) {
// 下载文件
HttpFileHelper.localToDown(this.getFileName(), downFileName, response);
} else {
......@@ -89,7 +90,7 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> {
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.getWriter().print(JsonHelper.serialize(res));
}
return ok && config.getExportType() != ExportData.EXPORT_TYPE_WAIT;
return isDown;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment