From 7ded370e51fde68a8eb092d683223b5d867178f8 Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Fri, 12 Apr 2024 14:14:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-2227)=20=E8=A7=92=E8=89=B2tree?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0workspaceType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java    | 2 ++
 .../cn/axzo/tyr/server/controller/role/SaasRoleController.java | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java
index 4692331f..e0f1aabe 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java
@@ -23,6 +23,8 @@ public class RoleTreeRes {
      */
     private String workspaceTypeCode;
 
+    private String workspaceType;
+
     /**
      * 名字
      */
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
index 522bbcd1..985a3469 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
@@ -5,6 +5,7 @@ import cn.axzo.framework.domain.web.result.ApiListResult;
 import cn.axzo.framework.domain.web.result.ApiPageResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.TyrSaasRoleApi;
+import cn.axzo.tyr.client.model.enums.DictWorkSpaceTypeEnum;
 import cn.axzo.tyr.client.model.req.ChangeGroupLeaderRoleReq;
 import cn.axzo.tyr.client.model.req.CommonDictQueryReq;
 import cn.axzo.tyr.client.model.req.FeatureRoleRelationReq;
@@ -197,6 +198,7 @@ public class SaasRoleController implements TyrSaasRoleApi {
         // 因为根节点在roleGroup里面没有，都是workspaceTypeCode，描述是放在字典表里
         List<CommonDictResp> commonDicts = listRootRole(req);
 
+
         List<RoleTreeRes> roots = commonDicts.stream()
                 .map(e -> RoleTreeRes.builder()
                         .id(e.getId())
@@ -204,6 +206,7 @@ public class SaasRoleController implements TyrSaasRoleApi {
                         .name(e.getDictValue())
                         .type(ROOT_TYPE)
                         .idStr(e.getId() + ":" + ROOT_TYPE)
+                        .workspaceType(DictWorkSpaceTypeEnum.getByValueWorkspaceType(Integer.valueOf(e.getDictCode())).getValue())
                         .build())
                 .collect(Collectors.toList());