From d5a91261a5858d5a9cc94bad2684c860254a4382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sat, 14 Dec 2024 23:07:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BC=93=E5=AD=98=E5=A4=84=E7=90=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20null=E7=9A=84=E6=B8=85=E7=A9=BA=E4=B8=8B=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E7=BC=93=E5=AD=98=20=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java
index 790297df..92717394 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java
@@ -40,7 +40,7 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
      * @param roleId 角色ID
      * @return 返回角色的自定义权限语句，如果没有找到则返回 null
      */
-    @Cacheable(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId")
+    @Cacheable(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId", condition = "#roleId != null")
     @Override
     public String getRoleCustom(Long roleId) {
         if (ObjectUtil.isNull(roleId)) {
@@ -62,7 +62,7 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
      * @param deptId 部门ID
      * @return 返回部门及其下级的权限语句，如果没有找到则返回 null
      */
-    @Cacheable(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId")
+    @Cacheable(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId", condition = "#deptId != null")
     @Override
     public String getDeptAndChild(Long deptId) {
         if (ObjectUtil.isNull(deptId)) {