Merge remote-tracking branch 'origin/test-merge' into test-merge

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

@@ -4311,11 +4311,10 @@ public class ExcelTabController extends BladeController {
     @PostMapping("/add-buss-imginfo")
     @ApiOperationSupport(order = 32)
     @ApiOperation(value = "表单填写图片上传", notes = "表单填写图片上传")
-    public R addBussFile(@RequestParam MultipartFile file, @RequestParam Long pkeyId,@RequestParam String key) {
+    public R addBussFile(@RequestParam MultipartFile file, String oldUrl) {
         BladeFile bladeFile = this.newIOSSClient.uploadFileByInputStream(file);
-        String oldOSSUrl = isExistOssUrl(pkeyId,key);
-        if(bladeFile!=null&&StringUtils.isNotEmpty(oldOSSUrl)){
-            String fileName=oldOSSUrl.substring(oldOSSUrl.lastIndexOf("/")+1);
+        if(bladeFile!=null&&StringUtils.isNotEmpty(oldUrl)){
+            String fileName=oldUrl.substring(oldUrl.lastIndexOf("/")+1);
             newIOSSClient.removeFile(fileName);
         }
         return R.data(bladeFile);