From e7939ee7a96be71438e3950055fc5cd6e578e1f5 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 20 Dec 2022 16:16:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/baiye/component/PermissionComponent.java | 5 ++--- .../baiye/modules/system/service/impl/UserServiceImpl.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/component/PermissionComponent.java b/ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/component/PermissionComponent.java index 0a00f1e4..a247eac1 100644 --- a/ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/component/PermissionComponent.java +++ b/ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/component/PermissionComponent.java @@ -2,12 +2,11 @@ package com.baiye.component; import cn.hutool.core.collection.CollUtil; import com.baiye.util.SecurityUtils; -import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * @description 判断权限 @@ -22,7 +21,7 @@ public class PermissionComponent { */ public Boolean check(String ... permissions){ // 获取当前用户的权限 - List userPermissions = SecurityUtils.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); + List userPermissions = new ArrayList<>(SecurityUtils.getCurrentUser().getRoles()); if (CollUtil.isEmpty(userPermissions)){ return false; } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index ff898698..218bfa94 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -661,7 +661,6 @@ public class UserServiceImpl implements UserService { if (businessConfig.getIds().contains(role.getId())) { convert.setIsManager(Boolean.TRUE); if (companyByUserId != null) { - convert.setUserBalance(companyByUserId.getUserBalance()); } }