From c670da3c8a86cbf85901801913814afa0a56d8c5 Mon Sep 17 00:00:00 2001
From: chenweiwei <chenweiwei@axzo.cn>
Date: Sun, 10 Sep 2023 12:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9D=83=E9=99=90=E7=82=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/model/permission/PermissionPointTreeNode.java | 3 +++
 .../java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java     | 9 +++++++++
 .../server/service/impl/PermissionPointServiceImpl.java  | 1 +
 3 files changed, 13 insertions(+)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
index e3f6b053..cb31a7c5 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
@@ -23,6 +23,9 @@ public class PermissionPointTreeNode implements IBaseTree<PermissionPointTreeNod
     /** 权限点名称 **/
     private String permissionName;
 
+    /** 权限code **/
+    private String code;
+
     /** 排序 **/
     private Integer sort;
 
diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java
index 30535531..21ca497f 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java
@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Data
 @AllArgsConstructor
@@ -57,4 +58,12 @@ public class SaasRoleVO {
 
 	private Date updateAt;
 
+	/**
+	 * 获取角色对应所用的权限
+	 * @return
+	 */
+	public List<PermissionPointTreeNode> getFeature(){
+		return permissionGroup.stream().map(SaasPermissionGroupVO::getFeature).flatMap(List::stream).collect(Collectors.toList());
+	}
+
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
index b57c634e..78a66aca 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
@@ -301,6 +301,7 @@ public class PermissionPointServiceImpl implements PermissionPointService {
         PermissionPointTreeNode node = new PermissionPointTreeNode();
         node.setPermissionPointId(feature.getId());
         node.setPermissionName(feature.getFeatureName());
+        node.setCode(feature.getFeatureCode());
         node.setParentId(feature.getParentId());
         node.setTerminal(feature.getTerminal());
         node.setFeatureType(feature.getFeatureType());