From fe9d313c2a1d6799a2f717935d18f9ac24e1c2c6 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 17 Apr 2024 13:57:15 +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=E6=94=B9=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=E4=B8=8B?=
 =?UTF-8?q?=E6=AC=A1=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=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=1039584 --user=王孝刚 【项目/组织/系统任务中心】定时任务列表-下次执行时间排序报SQL异常
https://www.tapd.cn/55049933/s/1499639
---
 .../main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml | 3 ++-
 .../io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml   | 3 ++-
 .../java/io/metersphere/system/mapper/ExtScheduleMapper.xml    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
index 0ba44eddbd..bfc6bc06d2 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
@@ -149,7 +149,7 @@
                             </foreach>
                         </when>
                         <when test="key=='organizationIds'">
-                            and project.organization_id in
+                            and api_report.organization_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>
@@ -171,6 +171,7 @@
         ar.create_user AS operationName,
         ar.trigger_mode,
         ar.start_time,
+        project.organization_id,
 
         CASE
         WHEN ar.integrated = 0 THEN
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
index 20d56cebcb..c389c30870 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
@@ -151,6 +151,7 @@
         asr.trigger_mode,
         asr.script_identifier,
         asr.start_time,
+        project.organization_id,
 
         CASE
         WHEN asr.integrated = 0 THEN
@@ -293,7 +294,7 @@
                             </foreach>
                         </when>
                         <when test="key=='organizationIds'">
-                            and project.organization_id in
+                            and api_scenario_report.organization_id in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
                             </foreach>
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 17281be159..021472807c 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 nextTime  from (
+   select task.*, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time  from (
     <if test="request.scheduleTagType == 'API_IMPORT'">
         SELECT
         schedule.id,