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 4b305a75fa..4c211c85a3 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 @@ -259,29 +259,9 @@ public class BaseTaskHubService { .flatMap(item -> Stream.of(item.getCreateUserName())) .collect(Collectors.toSet()); Map userMap = userLoginService.getUserNameMap(new ArrayList<>(userSet)); - - List resourceIds = list.stream() - .map(TaskHubScheduleDTO::getResourceId) - .filter(StringUtils::isNotBlank) - .toList(); - - Map trigerTimeMap = Map.of(); - if (CollectionUtils.isNotEmpty(resourceIds)) { - trigerTimeMap = extScheduleMapper.getLastAndNextTime(resourceIds) - .stream() - .collect(Collectors.toMap(TaskHubScheduleDTO::getResourceId, Function.identity())); - } - for (TaskHubScheduleDTO item : list) { item.setCreateUserName(userMap.getOrDefault(item.getCreateUserName(), StringUtils.EMPTY)); item.setOrganizationName(orgMap.getOrDefault(item.getProjectId(), StringUtils.EMPTY)); - if (trigerTimeMap.get(item.getResourceId()) != null) { - item.setNextTime(trigerTimeMap.get(item.getResourceId()).getNextTime()); - item.setLastTime(trigerTimeMap.get(item.getResourceId()).getLastTime()); - } else { - item.setNextTime(item.getNextTime()); - item.setLastTime(item.getLastTime()); - } } } diff --git a/frontend/src/views/taskCenter/component/systemTaskTable.vue b/frontend/src/views/taskCenter/component/systemTaskTable.vue index d8df05d78c..f12b8393b0 100644 --- a/frontend/src/views/taskCenter/component/systemTaskTable.vue +++ b/frontend/src/views/taskCenter/component/systemTaskTable.vue @@ -53,10 +53,6 @@ /> {{ record.value }} -