|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.cloud.kicc.system.service.impl; |
|
|
|
package com.cloud.kicc.system.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.util.ArrayUtil; |
|
|
|
import cn.hutool.core.util.ArrayUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
@ -91,13 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
roleList.forEach(role -> { |
|
|
|
roleList.forEach(role -> { |
|
|
|
permissions.add(SecurityConstants.ROLE + role.getId()); |
|
|
|
permissions.add(SecurityConstants.ROLE + role.getId()); |
|
|
|
List<String> perms = menuService.selectPermsByRoleId(role.getId()); |
|
|
|
List<String> perms = menuService.selectPermsByRoleId(role.getId()); |
|
|
|
if(perms != null && perms.size() > 0){ |
|
|
|
permissions.addAll(perms.stream().filter(item -> StrUtil.isNotBlank(item)).collect(Collectors.toList())); |
|
|
|
perms.forEach(item -> { |
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(item)) { |
|
|
|
|
|
|
|
permissions.add(item); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 设置多租户编码信息
|
|
|
|
// 设置多租户编码信息
|
|
|
|
List<String> codes = tenantService.selectTenantCodeByRoleId(role.getId()); |
|
|
|
List<String> codes = tenantService.selectTenantCodeByRoleId(role.getId()); |
|
|
|
tenantCode.addAll(codes); |
|
|
|
tenantCode.addAll(codes); |
|
|
|