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 |   53 +++++++++++++++++++++++++----------------------------
 1 files changed, 25 insertions(+), 28 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 9125d9e..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
@@ -25,7 +25,6 @@
 import com.ycl.utils.common.LiveTimeMillisecond;
 import com.ycl.utils.common.MacUtils;
 import com.ycl.utils.common.PojoUtils;
-import com.ycl.utils.common.RandomUtils;
 import com.ycl.utils.redis.RedisKey;
 import com.ycl.vo.user.UserVO;
 import org.apache.commons.lang3.StringUtils;
@@ -81,6 +80,8 @@
     UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
     @Resource
     AdminMenuRelationMapper adminMenuRelationMapper;
+    @Resource
+    UmsMenuMapper umsMenuMapper;
 
     @Override
     public UmsAdmin getAdminByUsername(String username) {
@@ -132,31 +133,29 @@
         }
         //缁戝畾鑿滃崟浜庣敤鎴�
         if (!ids.isEmpty()) {
-            Integer size = 0;
-            Long maxId = null;
+            ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
             for (Long id : ids) {
-                if (size < umsRoleMenuRelationMapper
+                umsRoleMenuRelations.addAll(umsRoleMenuRelationMapper
                         .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
-                                .eq(UmsRoleMenuRelation::getRoleId, id)).size()) {
-                    size = umsRoleMenuRelationMapper
-                            .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
-                                    .eq(UmsRoleMenuRelation::getRoleId, id)).size();
-                    maxId = id;
-                }
+                                .eq(UmsRoleMenuRelation::getRoleId, id)));
             }
-            umsRoleMenuRelationMapper
-                    .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
-                            .eq(UmsRoleMenuRelation::getRoleId, maxId))
+            umsRoleMenuRelations
                     .stream()
-                    .forEach(item->{
+                    .map(item->item.getMenuId())
+                    .collect(Collectors.toList())
+                    .stream()
+                    .distinct()
+                    .collect(Collectors.toList())
+                    .stream()
+                    .forEach(item -> {
                         AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                         adminMenuRelation.setAdminId(umsAdmin.getId());
-                        adminMenuRelation.setMenuId(item.getMenuId());
+                        adminMenuRelation.setMenuId(item);
                         adminMenuRelationMapper.insert(adminMenuRelation);
                     });
         }
         //瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
-        umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
+        //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
         baseMapper.updateById(umsAdmin);
 
         return umsAdmin;
@@ -289,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
@@ -329,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("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
@@ -416,11 +413,11 @@
         QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
         wrapperUser.in("id", arr);
         List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
-        if (adminList == null||adminList.isEmpty()) {
+        if (adminList == null || adminList.isEmpty()) {
             throw new ApiException("鏈煡璇㈠埌鐢ㄦ埛");
         }
         if ("02".equals(sendType)) {
-           str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
+            str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
         } else {
             str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
         }

--
Gitblit v1.8.0