质检附件上传排序

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -4416,31 +4416,31 @@ public class ExcelTabController extends BladeController {
         private String url;
     }
     @PostMapping("/previewBussfile")
-    public R<List<BussfileDTO>> previewBussfile(@RequestPart("files")MultipartFile[] files){
+    public R<List<BussfileDTO>> previewBussfile(@RequestPart("file")MultipartFile[] file){
         List<BussfileDTO>list=new ArrayList<>();
-        for (int i = 0; i < files.length; i++){
+        for (int i = 0; i < file.length; i++){
             BussfileDTO dto = new BussfileDTO();
-            R<BladeFile> bladeFile = iossClient.addFileInfo(files[i]);
+            R<BladeFile> bladeFile = iossClient.addFileInfo(file[i]);
             BladeFile bladeFile1 = bladeFile.getData();
             String fileExtension = FileUtil.getFileExtension(bladeFile1.getName()).toLowerCase();
             NewBladeFile newBladeFile = new NewBladeFile();
             if (fileExtension.contains("xlsx")) {
-                newBladeFile = this.commonFileClient.excelToPdf(files[i]);
+                newBladeFile = this.commonFileClient.excelToPdf(file[i]);
                 dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("xls")) {
-                newBladeFile = this.commonFileClient.excelToPdf(files[i]);
+                newBladeFile = this.commonFileClient.excelToPdf(file[i]);
                 dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("docx")) {
-                newBladeFile = this.commonFileClient.wordToPdf(files[i]);
+                newBladeFile = this.commonFileClient.wordToPdf(file[i]);
                 dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("png") || fileExtension.contains("jpg") || fileExtension.contains("webp") || fileExtension.contains("apng") ||
                     fileExtension.contains("bmp") || fileExtension.contains("jepg") || fileExtension.contains("tif") || fileExtension.contains("gif")) {
-                newBladeFile = this.commonFileClient.pngOrJpgToPdf(files[i]);
+                newBladeFile = this.commonFileClient.pngOrJpgToPdf(file[i]);
                 dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("pdf")) {
                 dto.setUrl(bladeFile1.getLink());
             }
-            dto.setName(files[i].getOriginalFilename());
+            dto.setName(file[i].getOriginalFilename());
             list.add(dto);
         }
         return R.data(list);
@@ -4514,7 +4514,9 @@ public class ExcelTabController extends BladeController {
             if (tabpdf2.exists()) {
                 tabpdf2.delete();
             }
-            FileUtils.mergePdfPublicMethods(datainfo, listPdf);
+            if(datainfo.size()>=2){
+                FileUtils.mergePdfPublicMethods(datainfo, listPdf);
+            }
             String netUrl = "";
             BladeFile bladeFile = this.newIOSSClient.uploadFile(nodeId + ".pdf", listPdf);
             if (bladeFile != null && ObjectUtils.isNotEmpty(bladeFile.getLink())) {