feat:(REQ-2227) 角色tree接口查询增加查询条件

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;
 }

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()));
 

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;