From f787ed11d43c05310bbed71b55a8e0b88fc26d13 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 12 Mar 2021 10:25:17 +0800
Subject: [PATCH 1/2] refactor: i18n

---
 .../src/business/components/settings/system/BaseSetting.vue    | 2 +-
 frontend/src/i18n/en-US.js                                     | 3 ++-
 frontend/src/i18n/zh-CN.js                                     | 3 ++-
 frontend/src/i18n/zh-TW.js                                     | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue
index 822951078a..951aab070a 100644
--- a/frontend/src/business/components/settings/system/BaseSetting.vue
+++ b/frontend/src/business/components/settings/system/BaseSetting.vue
@@ -42,7 +42,7 @@ export default {
         url: [
           {
             required: true,
-            message: this.$t('system_par'),
+            message: this.$t('system_config.base.url_is_null'),
             trigger: ['change', 'blur']
           },
         ],
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index a2e8f3926a..91e69c74ce 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -240,7 +240,8 @@ export default {
     base_config: 'Base Config',
     base: {
       url: 'Website URL',
-      url_tip: 'example：http://localhost:8081'
+      url_tip: 'example：http://localhost:8081',
+      url_is_null: 'The current site URL cannot be empty'
     }
   },
   workspace: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index ee02668daa..db08f19989 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -241,7 +241,8 @@ export default {
     base_config: '基本配置',
     base: {
       url: '当前站点URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      url_is_null: '当前站点URL不能为空'
     }
   },
   workspace: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index a634debaf0..ccbc5805d6 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -241,7 +241,8 @@ export default {
     base_config: '基本配置',
     base: {
       url: '當前站點URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      url_is_null: '當前站點URL不能為空'
     }
   },
   workspace: {

From 846345cdd23bf850070baf43ed28745cb92f525d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 12 Mar 2021 10:37:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20SQL=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 5b8bb7ecdc..1e132017fd 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -299,8 +299,8 @@
         select test_plan_test_case.*, test_case.*
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
-        where status != 'Prepare'
-        and status != 'Underway'
+        where test_plan_test_case.status != 'Prepare'
+        and test_plan_test_case.status != 'Underway'
         and test_plan_test_case.Executor = #{request.executor}
         and test_plan_test_case.plan_id in
         <foreach collection="request.planIds" item="planId" separator="," open="(" close=")">