调整用户信息相应结构

src/main/java/com/zzsn/knowbase/entity/KbRole.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * <p>
@@ -71,7 +70,7 @@ public class KbRole extends Model<KbRole> {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField(exist = false)
-    private List<KbPermissions> permissions;
+//    @TableField(exist = false)
+//    private List<KbPermissions> permissions;
 
 }

src/main/java/com/zzsn/knowbase/service/impl/KbAuthorizedUserServiceImpl.java

@@ -20,7 +20,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -143,15 +146,19 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             List<KbRole> kbRoles = roleService.listByIds(Arrays.asList(one.getRoleId().split(",")));
 
             List<KbRolePermissionMap> permissionMaps = rolePermissionMapService.list(Wrappers.<KbRolePermissionMap>lambdaQuery().in(KbRolePermissionMap::getRoleId, Arrays.asList(one.getRoleId().split(","))));
-            Map<Long, List<KbRolePermissionMap>> collect = permissionMaps.stream().collect(Collectors.groupingBy(KbRolePermissionMap::getRoleId));
-
-            kbRoles.forEach(e->{
-                List<Long> longs = CollectionUtil.isEmpty(collect.get(e.getId())) ? null : collect.get(e.getId()).stream().map(KbRolePermissionMap::getPermissionId).collect(Collectors.toList());
-                if (CollectionUtil.isNotEmpty(longs)) {
-                    e.setPermissions(permissionsService.list(Wrappers.<KbPermissions>lambdaQuery().in(KbPermissions::getId,longs)));
-                }
-            });
 
+//            Map<Long, List<KbRolePermissionMap>> collect = permissionMaps.stream().collect(Collectors.groupingBy(KbRolePermissionMap::getRoleId));
+//            List<KbPermissions> permissions = new ArrayList<>();
+//            kbRoles.forEach(e->{
+//                List<Long> longs = CollectionUtil.isEmpty(collect.get(e.getId())) ? new ArrayList<Long>() : collect.get(e.getId()).stream().map(KbRolePermissionMap::getPermissionId).collect(Collectors.toList());
+//                if (CollectionUtil.isNotEmpty(longs)) {
+//                    e.setPermissions(permissionsService.list(Wrappers.<KbPermissions>lambdaQuery().in(KbPermissions::getId,longs)));
+//                }
+//            });
+            if (CollectionUtil.isNotEmpty(permissionMaps)) {
+                List<KbPermissions> permissions = permissionsService.list(Wrappers.<KbPermissions>lambdaQuery().in(KbPermissions::getId, permissionMaps.stream().map(KbRolePermissionMap::getPermissionId).collect(Collectors.toList())));
+                userInfoVo.setPermissions(permissions);
+            }
             userInfoVo.setRoles(kbRoles);
             userInfoVo.setAuthorizedUser(one);
 

src/main/java/com/zzsn/knowbase/vo/UserInfoVo.java

 package com.zzsn.knowbase.vo;
 
 import com.zzsn.knowbase.entity.KbAuthorizedUser;
+import com.zzsn.knowbase.entity.KbPermissions;
 import com.zzsn.knowbase.entity.KbRole;
 import lombok.Data;
 
@@ -18,4 +19,5 @@ public class UserInfoVo {
     private KbAuthorizedUser authorizedUser;
 
     private List<KbRole> roles;
+    private List<KbPermissions> permissions;
 }