From 3e194c0902c307b0cfa2ec14bf303310eb1fb6e9 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 26 十月 2022 16:52:35 +0800
Subject: [PATCH] 解决用户权限问题

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index bb6d7fe..c2748d6 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -288,16 +288,14 @@
     }
 
     @Override
-    public List<UmsResource> getResourceList(Long adminId) {
-        List<UmsResource> resourceList = getCacheService().getResourceList(adminId);
-        if (CollUtil.isNotEmpty(resourceList)) {
-            return resourceList;
+    public List<UmsMenu> getResourceList(Long adminId) {
+        List<UmsMenu> umsMenuList = getCacheService().getResourceList(adminId);
+        if (CollUtil.isNotEmpty(umsMenuList)) {
+            return umsMenuList;
         }
-        resourceList = umsResourceMapper.getResourceList(adminId);
-        if (CollUtil.isNotEmpty(resourceList)) {
-            getCacheService().setResourceList(adminId, resourceList);
-        }
-        return resourceList;
+        umsMenuList = umsMenuMapper.getMenuList(adminId);
+            getCacheService().setResourceList(adminId, umsMenuList);
+        return umsMenuList;
     }
 
     @Override
@@ -328,7 +326,7 @@
         //鑾峰彇鐢ㄦ埛淇℃伅
         UmsAdmin admin = getAdminByUsername(username);
         if (admin != null) {
-            List<UmsResource> resourceList = getResourceList(admin.getId());
+            List<UmsMenu> resourceList = getResourceList(admin.getId());
             return new AdminUserDetails(admin, resourceList);
         }
         throw new UsernameNotFoundException("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");

--
Gitblit v1.8.0