summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuai <[email protected]>2024-09-10 18:10:56 +0800
committerzhangshuai <[email protected]>2024-09-10 18:10:56 +0800
commitdaf362aa0b85b290295f0dc9ff35faa9a7cc13e5 (patch)
tree83c695dce97fc5645dc4a09c8200924f6cd4a11b
parent160c7e9117df93457daac326c9d816a06230d7d7 (diff)
fix: 调整 env 详情接口
-rw-r--r--src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java8
1 files changed, 5 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 190f0bc..a641193 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
@@ -64,9 +64,11 @@ public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, Environm
// workspaces
List<EnvironmentWorkspaceEntity> environmentWorkspaceList = environmentWorkspaceService.list(new LambdaQueryWrapper<EnvironmentWorkspaceEntity>().eq(EnvironmentWorkspaceEntity::getEnvId, id));
- List<String> workspaceIds = environmentWorkspaceList.stream().map(x -> x.getWorkspaceId()).toList();
- List<WorkspaceEntity> workspaceList = workspaceService.list(new LambdaQueryWrapper<WorkspaceEntity>().in(WorkspaceEntity::getId, workspaceIds));
- environment.setWorkspaces(workspaceList);
+ if (T.CollUtil.isNotEmpty(environmentWorkspaceList)) {
+ List<String> workspaceIds = environmentWorkspaceList.stream().map(x -> x.getWorkspaceId()).toList();
+ List<WorkspaceEntity> workspaceList = workspaceService.list(new LambdaQueryWrapper<WorkspaceEntity>().in(WorkspaceEntity::getId, workspaceIds));
+ environment.setWorkspaces(workspaceList);
+ }
// session
EnvironmentSessionEntity deviceSession = environmentSessionService.getOne(new LambdaQueryWrapper<EnvironmentSessionEntity>()