Fixed groupApiservice(hasReadPermission) and ResourcePermissionHandler(orgUserPermissionMono).

dragonpoo · ludomikula · commit 097064f5a201 · 2025-05-28T10:53:35.000+02:00
Add superAdmin to permission.
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java
@@ -249,7 +249,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnApplicati
         Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)
                 .flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))
                 .flatMap(orgMember -> {
-                    if (orgMember.isAdmin()) {
+                    if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
                         return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));
                     }
                     return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)
@@ -308,7 +308,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnBundle(St
         Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)
                 .flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))
                 .flatMap(orgMember -> {
-                    if (orgMember.isAdmin()) {
+                    if (orgMember.isAdmin() || orgMember.isSuperAdmin()) {
                         return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));
                     }
                     return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java
@@ -118,7 +118,7 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,
     private boolean hasReadPermission(Tuple2<GroupMember, OrgMember> tuple) {
         GroupMember groupMember = tuple.getT1();
         OrgMember orgMember = tuple.getT2();
-        return groupMember.isValid() || orgMember.isAdmin();
+        return orgMember.isSuperAdmin() || groupMember.isValid() || orgMember.isAdmin();
     }
 
     private boolean hasManagePermission(Tuple2<GroupMember, OrgMember> tuple) {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,`
`118`	`118`	`private boolean hasReadPermission(Tuple2<GroupMember, OrgMember> tuple) {`
`119`	`119`	`GroupMember groupMember = tuple.getT1();`
`120`	`120`	`OrgMember orgMember = tuple.getT2();`
`121`		`- return groupMember.isValid() \|\| orgMember.isAdmin();`
	`121`	`+ return orgMember.isSuperAdmin() \|\| groupMember.isValid() \|\| orgMember.isAdmin();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private boolean hasManagePermission(Tuple2<GroupMember, OrgMember> tuple) {`