fix(系统设置): 修改任务中心下次执行时间排序报错的缺陷

--bug=1039584 --user=王孝刚 【项目/组织/系统任务中心】定时任务列表-下次执行时间排序报SQL异常
https://www.tapd.cn/55049933/s/1499639
This commit is contained in:
wxg0103 2024-04-17 13:57:15 +08:00 committed by Craftsman
parent cab1b4d1e0
commit fe9d313c2a
3 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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>

View File

@ -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,