lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2024-01-25 10:55:29 +08:00
parent c8c8a8dbf6
commit bfeca9c694
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/cn/lihongjie/coal/filter/AuthFilter.java
View File

@@ -151,11 +151,18 @@ public class AuthFilter extends OncePerRequestFilter {
if (BooleanUtils.isTrue(user.getSysAdmin())) {
hasPermission = true;
} else if (BooleanUtils.isTrue(user.getOrgAdmin())) {
// 机构管理员
hasPermission = permissionService.orgAdminHasPermission(resource.get().getId());
} else {
// 普通用户默认权限
hasPermission = permissionService.orgUserHasPermission(resource.get().getId());
hasPermission = userService.hasResource(user.getId(), resource.get().getId());
if (!hasPermission) {
// 普通用户指定权限
hasPermission = userService.hasResource(user.getId(), resource.get().getId());
}
}
stopWatch.stop();

4
src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
View File

@@ -253,4 +253,8 @@ public class PermissionService extends BaseService<PermissionEntity, PermissionR
}
public boolean orgUserHasPermission(String resourceId) {
return this.repository.hasPermission(resourceId, Arrays.asList("0", "1"));
}
}