From cacf1e9eb19f3e95f08525a8a7516be317035fbf Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 9 Jan 2025 14:47:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=A1=8C=E9=9D=A2=E7=89=88?= =?UTF-8?q?=E3=80=91api=E6=95=B0=E6=8D=AE=E6=BA=90=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0-=E7=AE=80=E5=8D=95=E9=87=8D=E5=A4=8D-?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java | 6 ++---- .../io/dataease/datasource/server/DatasourceTaskServer.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java index 9d8b568566..a003b145f1 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/ExtDatasourceTaskMapper.java @@ -17,10 +17,8 @@ public interface ExtDatasourceTaskMapper { @Select( """ - SELECT core_datasource.name as datasource_name,core_datasource_task.* , QRTZ_TRIGGERS.NEXT_FIRE_TIME as NEXT_FIRE_TIME - FROM core_datasource_task - left join core_datasource on core_datasource.id=core_datasource_task.ds_id - left join QRTZ_TRIGGERS on core_datasource_task.id=QRTZ_TRIGGERS.TRIGGER_NAME + SELECT QRTZ_TRIGGERS.* + FROM QRTZ_TRIGGERS ${ew.customSqlSegment} """ ) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java index 5da4dfd851..1a75e80019 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java @@ -126,7 +126,7 @@ public class DatasourceTaskServer { public List taskWithTriggers(Long taskId) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("core_datasource_task.id", String.valueOf(taskId)); + wrapper.eq("QRTZ_TRIGGERS.TRIGGER_NAME", String.valueOf(taskId)); return extDatasourceTaskMapper.taskWithTriggers(wrapper); }