From 010d16c495459c84525c6de4878aaef89a47eab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E6=B5=B7=E6=B4=8B?= <jinhaiyang@axzo.cn>
Date: Thu, 26 Oct 2023 18:06:32 +0800
Subject: [PATCH] =?UTF-8?q?listByRoleIds=20=E5=A2=9E=E5=8A=A0workspace=20i?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java | 4 +++-
 .../axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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 ac4a41f9..87ec7290 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
@@ -1,12 +1,12 @@
 package cn.axzo.tyr.client.model.vo;
 
-import cn.axzo.trade.datasecurity.core.annotation.control.DisableCrypt;
 import cn.axzo.tyr.client.model.permission.PermissionPointTreeNode;
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,6 +21,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Slf4j
 public class SaasRoleVO {
 
     private Long id;
@@ -125,6 +126,7 @@ public class SaasRoleVO {
             }
 
         }
+        log.info("+======permissionPoint: {}", permissionPoint);
         return new ArrayList<>((Collection) permissionPoint);
     }
 
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
index 8ed97f33..5d756db2 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
@@ -600,6 +600,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
                         .anyMatch(f -> featureIds.contains(f.getPermissionPointId())))
                 .collect(Collectors.toList());
 
+        log.info("-======matchedRoleList: {}", matchedRoleList);
         log.info("====计算角色实际的权限 - 匹配请求的权限  --> 实际拥有权限的角色:{}===",featureIds);
         //查询角色下用户
         List<Long> matchedRoleIds = matchedRoleList.stream().map(SaasRoleVO::getId).collect(Collectors.toList());