From 5158f4a0a91a69a25596c1c58a52b1a9f2ba7a18 Mon Sep 17 00:00:00 2001 From: wind Date: Mon, 17 Jan 2022 10:52:23 +0800 Subject: [PATCH] [Fix-8056] Rectify this issue about failing to edit worker groups for an environment. (#8072) (#8078) Co-authored-by: calvin --- .../api/service/impl/EnvironmentServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 ff0eea0cda..bd502e2e1a 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 @@ -366,17 +366,18 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme env.setOperator(loginUser.getId()); env.setUpdateTime(new Date()); - int update = environmentMapper.update(env, new UpdateWrapper().lambda().eq(Environment::getCode,code)); + int update = environmentMapper.update(env, new UpdateWrapper().lambda().eq(Environment::getCode, code)); if (update > 0) { deleteWorkerGroupSet.stream().forEach(key -> { - if (!StringUtils.isEmpty(key)) { + if (StringUtils.isNotEmpty(key)) { relationMapper.delete(new QueryWrapper() .lambda() - .eq(EnvironmentWorkerGroupRelation::getEnvironmentCode,code)); + .eq(EnvironmentWorkerGroupRelation::getEnvironmentCode, code) + .eq(EnvironmentWorkerGroupRelation::getWorkerGroup, key)); } }); addWorkerGroupSet.stream().forEach(key -> { - if (!StringUtils.isEmpty(key)) { + if (StringUtils.isNotEmpty(key)) { EnvironmentWorkerGroupRelation relation = new EnvironmentWorkerGroupRelation(); relation.setEnvironmentCode(code); relation.setWorkerGroup(key);