From 6b472807813b30d1aa4d8a5a86919f26945087b2 Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Fri, 12 Apr 2024 11:47:09 +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=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/tyr/client/model/req/TreeRoleReq.java     | 7 +++++++
 .../tyr/server/controller/role/SaasRoleController.java     | 6 ++++--
 .../main/java/cn/axzo/tyr/server/service/RoleService.java  | 6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java
index d9432ef1..7afc7c11 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java
@@ -14,4 +14,11 @@ public class TreeRoleReq {
     private String workspaceTypeCode;
 
     private Boolean needRole;
+
+    private Integer workspaceType;
+
+    /**
+     * '是否显示'
+     */
+    private Boolean isDisplay;
 }
\ No newline at end of file
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 8b8740e5..522bbcd1 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
@@ -314,8 +314,10 @@ public class SaasRoleController implements TyrSaasRoleApi {
         List<SaasRoleGroupRelation> saasRoleGroupRelations = saasRoleGroupRelationDao.getByGroupIds(roleGroupIds);
 
         Map<Long, SaasRoleRes> saasRoles = roleService.list(RoleService.ListSaasRoleParam.builder()
-                .roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId))
-                .build())
+                        .roleIds(Lists.transform(saasRoleGroupRelations, SaasRoleGroupRelation::getRoleId))
+                        .isDisplay(req.getIsDisplay())
+                        .workspaceType(req.getWorkspaceType())
+                        .build())
                 .stream()
                 .collect(Collectors.toMap(SaasRoleRes::getId, Function.identity()));
 
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
index 9108837f..69af777c 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
@@ -136,6 +136,12 @@ public interface RoleService extends IService<SaasRole> {
         @CriteriaField(field = "id", operator = Operator.IN)
         private List<Long> roleIds;
 
+        @CriteriaField(field = "workspaceType", operator = Operator.EQ)
+        private Integer workspaceType;
+
+        @CriteriaField(field = "isDisplay", operator = Operator.EQ)
+        private Boolean isDisplay;
+
         @CriteriaField(ignore = true)
         private Boolean needPermission;