fix

2024-06-13 18:23:41 +08:00
parent 9cc27b3ba1
commit 280f2485f6
11 changed files with 62 additions and 46 deletions
--- a/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java
+++ b/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java
@@ -125,7 +125,7 @@ public class DataScopeAspect {
        if (StringUtils.isNotNull(loginUser)) {
            SysUserEntity currentUser = loginUser.getUser();
            // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
+            if (StringUtils.isNotNull(currentUser) && SysUserEntity.isAdmin(currentUser)) {
                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), CustomSecurityContextHolder.getPermission());
                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                        controllerDataScope.userAlias(), permission);