From 6698bc6a66bcaaca8e401087ec31765230ca20fa Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Tue, 10 Sep 2024 16:18:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mgt=20list=20=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20workspaces=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/mapper/device/EnvironmentMapper.xml  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/db/mapper/device/EnvironmentMapper.xml b/src/main/resources/db/mapper/device/EnvironmentMapper.xml
index 92acaba..639cf76 100644
--- a/src/main/resources/db/mapper/device/EnvironmentMapper.xml
+++ b/src/main/resources/db/mapper/device/EnvironmentMapper.xml
@@ -33,6 +33,11 @@
             <result property="name" column="name"/>
             <result property="userName" column="user_name"/>
         </association>
+
+        <collection property="workspaces" columnPrefix="ws_" ofType="net.geedge.asw.module.workspace.entity.WorkspaceEntity">
+            <result property="id" column="id"/>
+            <result property="name" column="name"/>
+        </collection>
     </resultMap>
 
     <select id="queryList" resultMap="deviceResult">
@@ -45,12 +50,16 @@
 
             uu.id AS uu_id,
             uu.name AS uu_name,
-            uu.user_name AS uu_user_name
+            uu.user_name AS uu_user_name,
+
+            ws.id AS ws_id,
+            ws.name AS ws_name
         FROM environment e
             LEFT JOIN sys_user cu ON e.create_user_id = cu.id
             LEFT JOIN sys_user uu ON e.update_user_id = uu.id
             LEFT JOIN environment_session es ON e.id = es.env_id
             LEFT JOIN environment_workspace ew ON e.id = ew.env_id
+            LEFT JOIN workspace ws ON ws.id = ew.workspace_id
         <where>
             <if test="params.ids != null and params.ids != ''">
                 e.id in