|
@@ -4510,6 +4510,7 @@ public class ExcelTabController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
tableFileService.saveOrUpdateBatch(fileList);
|
|
|
+
|
|
|
String file_path = FileUtils.getSysLocalFileUrl();
|
|
|
String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
|
|
|
List<TableFileVO> data = tableFileService.selectTableFileListByTen(Long.valueOf(nodeId + ""), Integer.valueOf(classify));
|
|
@@ -4522,7 +4523,7 @@ public class ExcelTabController extends BladeController {
|
|
|
if (tabpdf2.exists()) {
|
|
|
tabpdf2.delete();
|
|
|
}
|
|
|
- if(datainfo.size()>=2){
|
|
|
+ if(datainfo.size()>=1){
|
|
|
FileUtils.mergePdfPublicMethods(datainfo, listPdf);
|
|
|
}
|
|
|
String netUrl = "";
|