Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
Y
yzg-util
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
YZG
yzg-util
Commits
a9d872c6
Commit
a9d872c6
authored
Jun 02, 2021
by
yanzg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并空行BUG
parent
0283f959
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ExcelHttp.java
.../src/main/java/com/yanzuoguang/cloud/excel/ExcelHttp.java
+3
-2
No files found.
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> {
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
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment