|
@@ -149,7 +149,7 @@ public class CacheServiceImpl implements CacheService {
|
|
|
uWrapper.lambda().eq(TBUserRole::getUserId, user.getId());
|
|
|
List<TBUserRole> tbUserRoleList = tbUserRoleService.list(uWrapper);
|
|
|
if (Objects.nonNull(tbUserRoleList)) {
|
|
|
- TBOrg tbOrg = cacheService.addOrgCache(user.getOrgId());
|
|
|
+ TBOrg tbOrg = Objects.nonNull(user.getOrgId()) ? cacheService.addOrgCache(user.getOrgId()) : null;
|
|
|
//根据角色名查权限
|
|
|
Set<String> roleCodes = tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet());
|
|
|
QueryWrapper<TBRolePrivilege> rpWrapper = new QueryWrapper<>();
|