From 6256e2f0c0a15a2def830a32f4c78c458ec5b477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Tue, 10 Sep 2024 22:52:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenant):=20#5911=205.6=20=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=A5=97=E9=A4=90=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E6=8C=87=E5=AE=9A=E7=A7=9F=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/service/impl/SysTenantServiceImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
index cf5766f89..6f5ab32b2 100755
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java
@@ -41,6 +41,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -85,7 +86,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     private final SysDictService dictService;
 
-    private final CacheManager cacheManager;
+    private final RedisTemplate redisTemplate;
 
     /**
      * 获取正常状态租户
@@ -298,8 +299,11 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
             });
         }
 
-        // 清空菜单权限缓存
-        cacheManager.getCache(CacheConstants.MENU_DETAILS).clear();
+        // 清空指定租户的菜单权限缓存
+        Set keys = redisTemplate.keys(String.format("%s:%s::*", tenantDTO.getId(), CacheConstants.MENU_DETAILS));
+        if (CollUtil.isNotEmpty(keys)) {
+            redisTemplate.delete(keys);
+        }
         return Boolean.TRUE;
     }