diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java index 61fee259928a3db00511e1c98eb7d254b82576ac..9734869633edc787b741490586bbe42a3496b236 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java @@ -425,13 +425,14 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme private Map checkUsedEnvironmentWorkerGroupRelation(Set deleteKeySet,String environmentName, Long environmentCode) { Map result = new HashMap<>(); for (String workerGroup : deleteKeySet) { - TaskDefinition taskDefinition = taskDefinitionMapper - .selectOne(new QueryWrapper().lambda() + List taskDefinitionList = taskDefinitionMapper + .selectList(new QueryWrapper().lambda() .eq(TaskDefinition::getEnvironmentCode,environmentCode) .eq(TaskDefinition::getWorkerGroup,workerGroup)); - if (Objects.nonNull(taskDefinition)) { - putMsg(result, Status.UPDATE_ENVIRONMENT_WORKER_GROUP_RELATION_ERROR,workerGroup,environmentName,taskDefinition.getName()); + if (Objects.nonNull(taskDefinitionList) && taskDefinitionList.size() != 0) { + Set collect = taskDefinitionList.stream().map(TaskDefinition::getName).collect(Collectors.toSet()); + putMsg(result, Status.UPDATE_ENVIRONMENT_WORKER_GROUP_RELATION_ERROR,workerGroup,environmentName, collect); return result; } }