diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml index 24a5398cd4..f9dec5f05e 100644 --- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml +++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml @@ -323,6 +323,13 @@ WHERE `group` = 'API_SCENARIO_TEST'AND enable IS TRUE ) + + AND api_scenario.id IN + ( + SELECT resource_id FROM `schedule` + WHERE `group` = 'API_SCENARIO_TEST' + ) + AND api_scenario.id IN ( diff --git a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_en_US.properties b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_en_US.properties index 255f695293..325ce33fc1 100644 --- a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_en_US.properties +++ b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_en_US.properties @@ -388,4 +388,6 @@ copy_template_name_too_long=Copy error, template name too long source_issue_template_is_empty=Copy error, source project is empty select_resource_error_and_check=Select the resource error, check it please load_test_file_not_have_jmx=Load test not have jmx file -load_test_file_is_not_jmx=Load test JMX file is illegal \ No newline at end of file +load_test_file_is_not_jmx=Load test JMX file is illegal +version_name_is_null=Version name is not null +current_version_already_exists=Current version already exists \ No newline at end of file diff --git a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_CN.properties b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_CN.properties index 9277a2b4af..112d59201e 100644 --- a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_CN.properties +++ b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_CN.properties @@ -385,4 +385,6 @@ copy_template_name_too_long=复制错误,模版名称过长 source_issue_template_is_empty=复制错误,源项目为空 select_resource_error_and_check=查找资源出错,请检查资源是否存在 load_test_file_not_have_jmx=性能测试里的JMX文件不存在 -load_test_file_is_not_jmx=性能测试里的JMX文件不合法 \ No newline at end of file +load_test_file_is_not_jmx=性能测试里的JMX文件不合法 +version_name_is_null=版本名称不能为空 +current_version_already_exists=当前版本已存在 \ No newline at end of file diff --git a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_TW.properties b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_TW.properties index cf882ec922..e6d175e7fd 100644 --- a/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_TW.properties +++ b/framework/sdk-parent/sdk/src/main/resources/i18n/commons_zh_TW.properties @@ -384,4 +384,6 @@ copy_template_name_too_long=複製錯誤,模版名稱過長 source_issue_template_is_empty=複製錯誤,源項目為空 select_resource_error_and_check=查找資源出錯,請檢查資源是否存在 load_test_file_not_have_jmx=性能測試文件中不包含JMX文件 -load_test_file_is_not_jmx=性能測試里的JMX文件不合法 \ No newline at end of file +load_test_file_is_not_jmx=性能測試里的JMX文件不合法 +version_name_is_null=版本名稱不能為空 +current_version_already_exists=當前版本已存在 \ No newline at end of file