fix 企业营业执照生成PDF问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -70,7 +70,7 @@ public class CommonController {
     @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
         try {
-            String extension = FileUploadUtils.getExtension(file);
+/*            String extension = FileUploadUtils.getExtension(file);
             if("bmp".equals(extension) || "gif".equals(extension) || "jpg".equals(extension) || "jpeg".equals(extension) || "png".equals(extension)){
                 //压缩图片
                 MultipartFile multipartFileCorrection = ImageSizeUtil.compressImg(file);
@@ -79,7 +79,9 @@ public class CommonController {
                 if (file == null){
                     return AjaxResult.error("图片不合规");
                 }
-            }
+            }*/
+            //压缩图片
+            file = ImageSizeUtil.compressImg(file);
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
@@ -105,7 +107,7 @@ public class CommonController {
     @PostMapping("/uploadNew")
     public AjaxResult uploadNewFile(@RequestParam("file") MultipartFile file, @RequestParam("loanApplicationNumber") String loanApplicationNumber, @RequestParam("fileName") String originalFilename) throws Exception {
         try {
-            String extension = FileUploadUtils.getExtension(file);
+/*            String extension = FileUploadUtils.getExtension(file);
             if("bmp".equals(extension) || "gif".equals(extension) || "jpg".equals(extension) || "jpeg".equals(extension) || "png".equals(extension)){
                 //压缩图片
                 MultipartFile multipartFileCorrection = ImageSizeUtil.compressImg(file);
@@ -114,10 +116,12 @@ public class CommonController {
                 if (file == null){
                     return AjaxResult.error("图片不合规");
                 }
-            }
+            }*/
 
 
             // 上传文件路径
+            //压缩图片
+            file = ImageSizeUtil.compressImg(file);
             String filePath = RuoYiConfig.getUploadPath();
             if ("其他附件".equals(originalFilename)) {
                 originalFilename = file.getOriginalFilename();
@@ -146,7 +150,7 @@ public class CommonController {
     @PreAuthorize("@ss.hasPermi('common:upload:uploadNewOcr')")
     public AjaxResult uploadNewOcrFile(@RequestParam("file") MultipartFile file, @RequestParam("loanApplicationNumber") String loanApplicationNumber, @RequestParam("fileName") String originalFilename) throws Exception {
         try {
-            String extension = FileUploadUtils.getExtension(file);
+/*            String extension = FileUploadUtils.getExtension(file);
             if("bmp".equals(extension) || "gif".equals(extension) || "jpg".equals(extension) || "jpeg".equals(extension) || "png".equals(extension)){
                 //压缩图片
                 MultipartFile multipartFileCorrection = ImageSizeUtil.compressImg(file);
@@ -155,7 +159,9 @@ public class CommonController {
                 if (file == null){
                     return AjaxResult.error("图片不合规");
                 }
-            }
+            }*/
+            //压缩图片
+            file = ImageSizeUtil.compressImg(file);
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称