Merge pull request #617 from owenlxu/issue_615

bug: auth权限支持本地级联 #615
TencentBlueKing · May 18, 2023 · 1fa0ef5 · 1fa0ef5
2 parents ffa2d47 + 8ba83ca
commit 1fa0ef5
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/...uth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/DevopsPermissionServiceImpl.kt b/...uth/src/main/kotlin/com/tencent/bkrepo/auth/service/bkauth/DevopsPermissionServiceImpl.kt
@@ -114,14 +114,11 @@ class DevopsPermissionServiceImpl constructor(
         with(request) {
             logger.debug("check devops permission request [$request]")
 
-            if (super.isUserLocalAdmin(uid)) {
+            if (super.isUserLocalAdmin(uid) || super.isUserLocalProjectAdmin(uid, projectId!!)) {
                 return true
             }
             // project权限
             if (resourceType == ResourceType.PROJECT.toString()) {
-                if (super.isUserLocalProjectAdmin(uid, projectId!!)) {
-                    return true
-                }
                 return checkDevopsProjectPermission(uid, projectId!!, action)
             }