From 73e913fb24bf163ab9c5332ab960b1eb56a6402b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 七月 2025 13:41:24 +0800
Subject: [PATCH] 修改common的对象引用

---
 se-system/src/main/java/com/terra/system/service/all/PermsService.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/se-system/src/main/java/com/terra/system/service/all/PermsService.java b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
index 6ee3538..40d8ed1 100644
--- a/se-system/src/main/java/com/terra/system/service/all/PermsService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
@@ -1,7 +1,9 @@
 package com.terra.system.service.all;
 
+import com.terra.common.entity.all.StaticData;
 import com.terra.system.entity.all.*;
 import com.terra.system.entity.sys.MenuEntity;
+import com.terra.system.entity.sys.ResEntity;
 import com.terra.system.mapper.all.PermsMapper;
 import org.springframework.stereotype.Service;
 
@@ -22,14 +24,23 @@
     RedisService redisService;
 
     @Override
-    public List<ResAuthEntity> selectRes(String uid) {
+    public List<ResEntity> selectRes(String uid) {
+        return selectResByUid(uid, false);
+    }
+
+    @Override
+    public List<ResEntity> selectAllRes() {
+        return selectResByUid(StaticData.ADMIN, true);
+    }
+
+    private List<ResEntity> selectResByUid(String uid, boolean isAll) {
         String key = RedisCacheKey.permsResKey(uid);
         Object obj = redisService.get(key);
         if (obj instanceof List<?>) {
-            return (List<ResAuthEntity>) obj;
+            return (List<ResEntity>) obj;
         }
 
-        List<ResAuthEntity> list = permsMapper.selectRes(uid);
+        List<ResEntity> list = isAll ? permsMapper.selectAllRes() : permsMapper.selectRes(uid);
         if (list != null && list.size() > 0) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
@@ -46,7 +57,7 @@
         }
 
         List<MenusAuthEntity> list = permsMapper.selectMenus(uid);
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
 
@@ -62,7 +73,7 @@
         }
 
         List<String> list = permsMapper.selectPerms(uid);
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
 
@@ -78,7 +89,7 @@
         }
 
         List<PermsAuthEntity> list = permsMapper.selectPermsEntity(uid);
-        if (list != null && list.size() > 0) {
+        if (list != null && !list.isEmpty()) {
             redisService.put(key, list, SettingData.CACHE_EXPIRE, TimeUnit.MINUTES);
         }
 

--
Gitblit v1.9.3