From 4cbd273f130fa2ace86da115844733b1f6c26655 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 24 Jun 2024 10:39:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BD=AC=E5=90=8E=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1042913 --user=王孝刚 【系统设置】系统/组织-任务中心-资源ID/名称跳转-非当前项目的资源也在当前项目下显示的
https://www.tapd.cn/55049933/s/1534413
---
 .../system/dto/taskcenter/TaskCenterDTO.java  |  2 ++
 .../dto/taskcenter/TaskCenterScheduleDTO.java |  3 +++
 .../system/mapper/ExtScheduleMapper.xml       |  2 +-
 .../taskCenter/component/apiCase.vue          | 14 +++++++-----
 .../taskCenter/component/scheduledTask.vue    | 14 +++++++-----
 .../taskCenter/component/testPlan.vue         | 22 +++++++++++--------
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
index 289b8529cc..3bf4536104 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterDTO.java
@@ -24,6 +24,8 @@ public class TaskCenterDTO implements Serializable {
 
     @Schema(description = "项目id")
     private String projectId;
+    @Schema(description = "组织id")
+    private String organizationId;
 
     @Schema(description = "报告id")
     private String id;
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java
index 6447ce78a4..119249bdda 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java
@@ -25,6 +25,9 @@ public class TaskCenterScheduleDTO implements Serializable {
     @Schema(description = "项目id")
     private String projectId;
 
+    @Schema(description = "组织id")
+    private String organizationId;
+
     @Schema(description = "任务id")
     private String id;
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
index 978e4adecd..3d4517abcb 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.system.mapper.ExtScheduleMapper">
     <select id="taskCenterSchedulelist" resultType="io.metersphere.system.dto.taskcenter.TaskCenterScheduleDTO">
-        select task.*, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time from (
+        select task.*, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id from (
         <if test="request.scheduleTagType == 'API_IMPORT'">
             SELECT
             schedule.id,
diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
index 88aa633d8d..4e2ebadcf2 100644
--- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue
+++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue
@@ -28,7 +28,7 @@
           type="text"
           class="one-line-text w-full"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceNum }}
         </div>
       </template>
@@ -37,7 +37,7 @@
           v-if="!record.integrated"
           class="one-line-text max-w-[300px]"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceName }}
         </div>
       </template>
@@ -539,18 +539,22 @@
   /**
    * 跳转接口用例详情
    */
-  function showDetail(id: string) {
+  function showDetail(record: any) {
     if (!hasJumpPermission.value) {
       return;
     }
     if (props.moduleType === 'API_CASE') {
       openNewPage(RouteEnum.API_TEST_MANAGEMENT, {
-        cId: id,
+        orgId: record.organizationId,
+        pId: record.projectId,
+        cId: record.resourceId,
       });
     }
     if (props.moduleType === 'API_SCENARIO') {
       openNewPage(RouteEnum.API_TEST_SCENARIO, {
-        id,
+        orgId: record.organizationId,
+        pId: record.projectId,
+        id: record.resourceId,
       });
     }
   }
diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
index 57ffd3888b..c84e57c9ed 100644
--- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
+++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue
@@ -50,7 +50,7 @@
           type="text"
           class="one-line-text w-full"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceNum }}
         </div>
       </template>
@@ -62,7 +62,7 @@
           "
           class="one-line-text max-w-[300px]"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceName }}
         </div>
       </template>
@@ -550,18 +550,22 @@
    * 跳转接口用例详情
    */
 
-  function showDetail(id: string) {
+  function showDetail(record: any) {
     if (!hasJumpPermission.value) {
       return;
     }
     if (props.moduleType === TaskCenterEnum.API_SCENARIO) {
       openNewPage(RouteEnum.API_TEST_SCENARIO, {
-        id,
+        orgId: record.organizationId,
+        pId: record.projectId,
+        id: record.resourceId,
       });
     }
     if (props.moduleType === TaskCenterEnum.TEST_PLAN) {
       openNewPage(RouteEnum.TEST_PLAN_INDEX_DETAIL, {
-        id,
+        orgId: record.organizationId,
+        pId: record.projectId,
+        id: record.resourceId,
       });
     }
   }
diff --git a/frontend/src/views/project-management/taskCenter/component/testPlan.vue b/frontend/src/views/project-management/taskCenter/component/testPlan.vue
index 0465db19e5..86a1e066df 100644
--- a/frontend/src/views/project-management/taskCenter/component/testPlan.vue
+++ b/frontend/src/views/project-management/taskCenter/component/testPlan.vue
@@ -28,7 +28,7 @@
           type="text"
           class="one-line-text w-full"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceNum }}
         </div>
       </template>
@@ -37,7 +37,7 @@
           v-if="!record.integrated"
           class="one-line-text max-w-[300px]"
           :class="[hasJumpPermission ? 'text-[rgb(var(--primary-5))]' : '']"
-          @click="showDetail(record.resourceId)"
+          @click="showDetail(record)"
           >{{ record.resourceName }}
         </div>
       </template>
@@ -75,7 +75,7 @@
             <MsButton
               class="!mr-0"
               :disabled="record.historyDeleted || !hasAnyPermission(permissionsMap[props.group].report)"
-              @click="viewReport(record.id, record.integrated)"
+              @click="viewReport(record)"
               >{{ t('project.taskCenter.viewReport') }}
             </MsButton>
           </a-tooltip>
@@ -84,7 +84,7 @@
           <MsButton
             class="!mr-0"
             :disabled="record.historyDeleted || !hasAnyPermission(permissionsMap[props.group].report)"
-            @click="viewReport(record.id, record.integrated)"
+            @click="viewReport(record)"
             >{{ t('project.taskCenter.viewReport') }}
           </MsButton>
         </div>
@@ -420,19 +420,23 @@
     }
   }
 
-  function viewReport(id: string, type: boolean) {
+  function viewReport(record: any) {
     openNewPage(RouteEnum.TEST_PLAN_REPORT_DETAIL, {
-      id,
-      type: type ? 'GROUP' : 'TEST_PLAN',
+      orgId: record.organizationId,
+      pId: record.projectId,
+      id: record.id,
+      type: record.integrated ? 'GROUP' : 'TEST_PLAN',
     });
   }
 
-  function showDetail(id: string) {
+  function showDetail(record: any) {
     if (!hasJumpPermission.value) {
       return;
     }
     openNewPage(RouteEnum.TEST_PLAN_INDEX_DETAIL, {
-      id,
+      orgId: record.organizationId,
+      pId: record.projectId,
+      id: record.resourceId,
     });
   }