diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/ApplicationQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/ApplicationQuery.java index 1c2fa816..4cc81e32 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/ApplicationQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/ApplicationQuery.java @@ -30,4 +30,7 @@ public class ApplicationQuery extends BaseQuery { @QueryField(field = "languageType") private String languageType; -} \ No newline at end of file + + @QueryField(field = "applicationCategoryId") + private Long applicationCategoryId; +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployServiceImpl.java index 7efc7ea8..86a89abc 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployServiceImpl.java @@ -398,8 +398,19 @@ public class DeployServiceImpl implements IDeployService { ? teamApps.stream().collect(groupingBy(TeamApplication::getEnvironmentId)) : Collections.emptyMap(); - // 遍历所有团队配置的环境,有应用就显示应用,没应用就显示空列表 - for (Environment env : envMap.values()) { + // 获取当前团队配置的环境ID列表 + Set currentTeamEnvIds = teamEnvConfigMap.values().stream() + .filter(config -> config.getTeamId().equals(teamId)) + .map(TeamEnvironmentConfig::getEnvironmentId) + .collect(Collectors.toSet()); + + // 只遍历当前团队配置的环境 + for (Long envId : currentTeamEnvIds) { + Environment env = envMap.get(envId); + if (env == null) { + continue; // 环境不存在,跳过 + } + // 获取该环境的应用列表(没有则为空列表) List envApps = appsByEnv.getOrDefault(env.getId(), Collections.emptyList());