diff --git a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java index a641193..ed6f45a 100644 --- a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java @@ -131,13 +131,14 @@ public class EnvironmentServiceImpl extends ServiceImpl sessionEntityList = environmentSessionService.list(new LambdaQueryWrapper().eq(EnvironmentSessionEntity::getStatus, 1)); - List envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList(); - + List sessionEntityList = environmentSessionService.queryListByUsed(); List packageList = this.getBaseMapper().mySession(page, params); + List envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList(); + Map sessionByEnvId = sessionEntityList.stream().collect(Collectors.toMap(EnvironmentSessionEntity::getEnvId, Function.identity())); for (EnvironmentEntity entity : packageList) { entity.setParam(entity.getParamJSONObject()); entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus()); + entity.setSession(sessionByEnvId.get(entity.getId())); } page.setRecords(packageList); return page;