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); }