From bfeca9c69430bb436d4c83a196154b81af893188 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 25 Jan 2024 10:55:29 +0800
Subject: [PATCH] bugfix

---
 src/main/java/cn/lihongjie/coal/filter/AuthFilter.java   | 9 ++++++++-
 .../coal/permission/service/PermissionService.java       | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java b/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java
index e9429be1..2ac2bb3b 100644
--- a/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java
+++ b/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java
@@ -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();
diff --git a/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java b/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
index 2e8851cf..c1425c90 100644
--- a/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
+++ b/src/main/java/cn/lihongjie/coal/permission/service/PermissionService.java
@@ -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"));
+    }
 }