From 509b52219b44cbbf16c3b364da566ed00f8aabbe Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 27 十月 2022 11:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
index 39a9145..9e1a4cb 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminCacheServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.entity.user.UmsAdmin;
 import com.ycl.entity.user.UmsAdminRoleRelation;
+import com.ycl.entity.user.UmsMenu;
 import com.ycl.entity.user.UmsResource;
 import com.ycl.mapper.user.UmsAdminMapper;
 import com.ycl.service.redis.RedisService;
@@ -106,18 +107,18 @@
     }
 
     @Override
-    public List<UmsResource> getResourceList(Long adminId) {
+    public List<UmsMenu> getResourceList(Long adminId) {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":" + adminId;
         String s = (String) redisService.get(key);
 //        return (List<UmsResource>) redisService.get(key);
-        List<UmsResource> umsResources = JSON.parseArray(s, UmsResource.class);
+        List<UmsMenu> umsResources = JSON.parseArray(s, UmsMenu.class);
         return umsResources;
     }
 
     @Override
-    public void setResourceList(Long adminId, List<UmsResource> resourceList) {
+    public void setResourceList(Long adminId, List<UmsMenu> menuList) {
         String key = REDIS_DATABASE + ":" + REDIS_KEY_RESOURCE_LIST + ":" + adminId;
-        redisService.set(key, JSON.toJSONString(resourceList), REDIS_EXPIRE);
+        redisService.set(key, JSON.toJSONString(menuList), REDIS_EXPIRE);
     }
 
     @Override

--
Gitblit v1.8.0