From cd6e53f96db1b5934806069237016a39abae0b78 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 16 Jul 2021 11:28:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8projectId=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml | 3 +++
 .../components/performance/test/EditPerformanceTest.vue       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index 0322e6a5a0..d812fcd6c7 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -16,6 +16,9 @@
             <if test="request.workspaceId != null">
                 and schedule.workspace_id = #{request.workspaceId}
             </if>
+            <if test="request.projectId != null">
+                and schedule.project_id = #{request.projectId}
+            </if>
             <if test="request.enable != null">
                 and schedule.enable = #{request.enable}
             </if>
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTest.vue b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
index 93e98dc0f3..142c9c4549 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTest.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTest.vue
@@ -339,6 +339,10 @@ export default {
       let param = {};
       param = this.test.schedule;
       param.resourceId = this.test.id;
+      // 兼容问题，数据库里有的projectId为空
+      if (!param.projectId) {
+        param.projectId = getCurrentProjectID();
+      }
       let url = '/performance/schedule/create';
       if (param.id) {
         url = '/performance/schedule/update';