diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml index 87d94fe025..615906521f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtExecTaskItemMapper.xml @@ -194,7 +194,7 @@ and organization_id = #{organizationId} - and `status` = 'RUNNING' + and `status` in ('RUNNING', 'PENDING') and deleted = false @@ -236,7 +236,7 @@ and organization_id = #{organizationId} - and `status` = 'RUNNING' + and `status` in ('RUNNING', 'PENDING') + + \ No newline at end of file diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java index 48566c8afd..50dad4b94d 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java @@ -692,7 +692,7 @@ public class BaseTaskHubService { } return ids; } else { - return request.getSelectIds(); + return extExecTaskMapper.getSelectIds(request.getSelectIds(), flag); } }