Merge remote-tracking branch 'origin/v1.1' into v1.1

backend/src/main/java/io/metersphere/api/service/APITestService.java

@@ -138,6 +138,7 @@ public class APITestService {
         testCaseService.checkIsRelateTest(testId);
         deleteFileByTestId(testId);
         apiReportService.deleteByTestId(testId);
+        scheduleService.deleteByResourceId(testId);
         apiTestMapper.deleteByPrimaryKey(testId);
     }
 

backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java

@@ -100,6 +100,9 @@ public class PerformanceTestService {
             });
         }
 
+        //delete schedule
+        scheduleService.deleteByResourceId(testId);
+
         // delete load_test
         loadTestMapper.deleteByPrimaryKey(request.getId());
 

backend/src/main/java/io/metersphere/service/ScheduleService.java

@@ -55,6 +55,12 @@ public class ScheduleService {
         return scheduleMapper.deleteByPrimaryKey(scheduleId);
     }
 
+    public int deleteByResourceId(String resourceId) {
+        ScheduleExample scheduleExample = new ScheduleExample();
+        scheduleExample.createCriteria().andResourceIdEqualTo(resourceId);
+        return scheduleMapper.deleteByExample(scheduleExample);
+    }
+
     public List<Schedule> listSchedule() {
         ScheduleExample example = new ScheduleExample();
         return scheduleMapper.selectByExample(example);