Merge remote-tracking branch 'origin/master'

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustAlterApplyServiceImpl.java

@@ -524,14 +524,15 @@ public class EntrustAlterApplyServiceImpl extends ServiceImpl<EntrustAlterApplyM
         // 鉴定确认书存储路径
         String identifyItemsConfirmLetterPdfFilePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustmentId + "/" + identifyItemsConfirmLetterFileName + ".pdf";
         String identifyItemsConfirmLetterWordFilePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustmentId + "/" + identifyItemsConfirmLetterFileName + ".docx";
-        String entrustmentLetterFileName = "鉴定委托书" + "-" + entrustmentNo;
+        String entrustLetterFileName = "鉴定委托书" + "-" + entrustmentNo;
         // 转换临时目录中的 word 文档为 PDF
-        String entrustmentLetterFileNamePdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustmentId + "/" + entrustmentLetterFileName + ".docx";
-
+        String entrustLetterFileNameWordFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustmentId + "/" + entrustLetterFileName + ".docx";
+        String entrustLetterFileNamePdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustmentId + "/" + entrustLetterFileName + ".pdf";
         try {
             ossFile.fileDelete(identifyItemsConfirmLetterWordFilePath);
             ossFile.fileDelete(identifyItemsConfirmLetterPdfFilePath);
-            ossFile.fileDelete(entrustmentLetterFileNamePdfFilePath);
+            ossFile.fileDelete(entrustLetterFileNamePdfFilePath);
+            ossFile.fileDelete(entrustLetterFileNameWordFilePath);
         } catch (Exception e) {
             e.printStackTrace();
             throw new ValidateCodeException("删除鉴定委托书和鉴定事项确认书失败！");