Skip to content

Y
yzg-util
Commit a9d872c6 authored by yanzg's avatar yanzg
Browse files
Options

合并空行ＢＵＧ

parent 0283f959
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/excel/ExcelHttp.java
View file @ a9d872c6
...@@ -74,7 +74,8 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> { ...@@ -74,7 +74,8 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> {
File fileRow = new File(fileNameRow); File fileRow = new File(fileNameRow);
boolean ok = file.exists(); 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); HttpFileHelper.localToDown(this.getFileName(), downFileName, response);
} else { } else {
...@@ -89,7 +90,7 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> { ...@@ -89,7 +90,7 @@ public class ExcelHttp<T extends Object> extends ExcelConsole<T> {
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.getWriter().print(JsonHelper.serialize(res)); 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