日志在保存时 删除原有的OSS文件

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ContractLogClientImpl.java

@@ -92,16 +92,6 @@ public class ContractLogClientImpl implements ContractLogClient {
     @Override
     public void updateTheLogPdfUrlByIds(String theLogId, String pdfUrl) {
         for (String id : theLogId.split(",")) {
-            ContractLog log = this.contractLogService.getById(id);
-            //将原来的OSS文件删除
-            if(StringUtils.isNotEmpty(pdfUrl)&&log!=null&&StringUtils.isNotEmpty(log.getPdfUrl())){
-                String pdfUrlResult = log.getPdfUrl();
-                int lastIndex = pdfUrlResult.lastIndexOf("upload");
-                if (lastIndex != -1) {
-                    String fileName = pdfUrlResult.substring(lastIndex);
-                    this.newIOSSClient.removeFile(fileName);
-                }
-            }
             this.contractLogService.update(Wrappers.<ContractLog>lambdaUpdate().set(ContractLog::getPdfUrl, pdfUrl).eq(ContractLog::getId, id));
         }
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -826,6 +826,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         if(ObjectUtil.isNotEmpty(ids)){
             List<ContractLog> contractLogList = jdbcTemplate.query("select * from u_contract_log where id in (" + ids + ")", new BeanPropertyRowMapper<>(ContractLog.class));
             ContractLog contractLog = contractLogList.get(0);
+            //将原来的OSS文件删除
+            if(contractLog!=null&&StringUtils.isNotEmpty(contractLog.getPdfUrl())){
+                String pdfUrlResult = contractLog.getPdfUrl();
+                int lastIndex = pdfUrlResult.lastIndexOf("upload");
+                if (lastIndex != -1) {
+                    String fileName = pdfUrlResult.substring(lastIndex);
+                    this.newIOSSClient.removeFile(fileName);
+                }
+            }
             String oldDataId1 = contractLog.getOldDataId();
             if (ObjectUtil.isNotEmpty(oldDataId1)){
                 oldDataId = oldDataId1+","+ids;