From fc1f1d082b666fcc4cc72d5ab6b8efca56c0700f Mon Sep 17 00:00:00 2001
From: zhansihu <zhansihu@axzo.cn>
Date: Thu, 4 Jan 2024 15:00:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(permission):=20=E6=9D=83=E9=99=90=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/tyr/client/model/enums/IdentityType.java     | 3 +++
 .../tyr/server/service/impl/PermissionCacheServiceImpl.java   | 2 +-
 .../axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java
index 7e5aa1cb..776fe09d 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java
@@ -32,6 +32,9 @@ public enum IdentityType implements IEnum{
 
 
     public static IdentityType getIdentityType(Integer code) {
+        if (code == null) {
+            return null;
+        }
         IdentityType[] values = values();
         for (IdentityType item : values) {
             if (item.getCode().equals(code)) {
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionCacheServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionCacheServiceImpl.java
index f05c0e41..7810f168 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionCacheServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionCacheServiceImpl.java
@@ -71,7 +71,7 @@ public class PermissionCacheServiceImpl implements PermissionCacheService {
 
     @Override
     public void cachePermission(PermissionCacheKey key, IdentityAuthRes.WorkspacePermission permission) {
-        RedisUtil.StringValueOps.setEx(key.buildPersonDisableKey(),
+        RedisUtil.StringValueOps.setEx(key.buildAuthKey(),
                 JSONObject.toJSONString(permission, SerializerFeature.DisableCircularReferenceDetect),
                 expireInMinutes, TimeUnit.MINUTES);
     }
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 e21a5296..cbda61f4 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
@@ -694,10 +694,10 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
     @Override
     public IdentityAuthRes findIdentityAuthMix(IdentityAuthReq req) {
         List<IdentityAuthRes.WorkspacePermission> permissions = null;
-        //不走缓存的情况：关闭缓存开关 - 缓存需要刷新  - 请求指明不走缓存 - 角色预览操作
+        //不走缓存的情况：关闭缓存开关 - 缓存临时禁用  - 请求指明不走缓存 - 角色预览操作
         boolean notUseCache = BooleanUtil.isFalse(req.getUseCache())
                 || CollectionUtil.isNotEmpty(req.getSpecifyRoleIds())
-                || !permissionCacheService.cacheDisable(
+                || permissionCacheService.cacheDisable(
                 PermissionCacheKey.builder()
                         .personId(req.getPersonId())
                         .identityId(req.getIdentityId())