From 6a61b00dbbecc7b575812f9a182d633bcf419abb Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 26 Jul 2023 17:35:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E5=88=9B=E5=BB=BA=E7=A9=BA=E6=95=B0=E6=8D=AE=E7=9A=84?=
=?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
--bug=1027757 --user=王孝刚
【系统设置】github#25533，项目设置-版本管理，可以创建全是空格的数据，系统设置-工作空间，创建空格数据提示名称不能为空，不统一
https://www.tapd.cn/55049933/s/1398059
---
.../metersphere/base/mapper/ext/ExtApiScenarioMapper.xml | 7 +++++++
.../sdk/src/main/resources/i18n/commons_en_US.properties | 4 +++-
.../sdk/src/main/resources/i18n/commons_zh_CN.properties | 4 +++-
.../sdk/src/main/resources/i18n/commons_zh_TW.properties | 4 +++-
4 files changed, 16 insertions(+), 3 deletions(-)
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