|
|
@@ -102,7 +102,8 @@ public class PdfController {
|
|
|
File file = new File(ReportUtils.getDocumentsDir(), pdfPath);
|
|
|
int pageSize = printService.export(u, pr, r, w, o, ExportType.PDF, file, null, true);
|
|
|
result.put("path", "pdf/preview?p=" + pdfPath);
|
|
|
- result.put("pageSize", pageSize);
|
|
|
+ // 页数为 0 时,实际为一页空白 pdf
|
|
|
+ result.put("pageSize", pageSize == 0 ? 1 : pageSize);
|
|
|
result.put("overload", false);
|
|
|
}
|
|
|
return result;
|
|
|
@@ -170,7 +171,7 @@ public class PdfController {
|
|
|
File file = new File(ReportUtils.getDocumentsDir(), pdfPath);
|
|
|
int pageSize = printService.export(u, pr, r, w, o, ExportType.PDF, file, null, true);
|
|
|
result.put("data", FileUtils.readData(new FileInputStream(file)));
|
|
|
- result.put("pageSize", pageSize);
|
|
|
+ result.put("pageSize", pageSize == 0 ? 1 : pageSize);
|
|
|
result.put("overload", false);
|
|
|
}
|
|
|
return result;
|