From ed5dd781b48c5caea4fbf3703fe85be171002be9 Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Wed, 11 Sep 2024 13:41:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mySession=20=E8=BF=94=E5=9B=9E=20session?=
 =?UTF-8?q?=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../environment/service/impl/EnvironmentServiceImpl.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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<EnvironmentDao, Environm
         params.put("currentUserId", currentUserId);
         Page page = new Query(EnvironmentEntity.class).getPage(params);
 
-        List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.list(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getStatus, 1));
-        List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
-
+        List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.queryListByUsed();
         List<EnvironmentEntity> packageList = this.getBaseMapper().mySession(page, params);
+        List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
+        Map<String, EnvironmentSessionEntity> 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;