feat：用户个人视角权限管理优化 #11138

TencentBlueKing · Dec 5, 2024 · 0cd7240 · 0cd7240
1 parent 43d760f
commit 0cd7240
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...pi-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt b/...pi-auth/src/main/kotlin/com/tencent/devops/auth/api/user/UserAuthResourceGroupResource.kt
@@ -132,6 +132,9 @@ interface UserAuthResourceGroupResource {
         @Parameter(description = "项目ID", required = true)
         @PathParam("projectId")
         projectId: String,
+        @Parameter(description = "资源类型", required = true)
+        @PathParam("resourceType")
+        resourceType: String,
         @Parameter(description = "用户组Id")
         @PathParam("groupId")
         groupId: Int,

diff --git a/...c/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt b/...c/main/kotlin/com/tencent/devops/auth/resources/user/UserAuthResourceGroupResourceImpl.kt
@@ -116,6 +116,7 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor(
     override fun getMemberGroupDetails(
         userId: String,
         projectId: String,
+        resourceType: String,
         groupId: Int,
         memberId: String
     ): Result<GroupDetailsInfoVo> {
@@ -129,8 +130,9 @@ class UserAuthResourceGroupResourceImpl @Autowired constructor(
             permissionManageFacadeService.getMemberGroupsDetails(
                 projectId = projectId,
                 memberId = memberId,
+                resourceType = resourceType,
                 iamGroupIds = listOf(groupId)
-            ).records.first { it.groupId == groupId || it.joinedType == JoinedType.DIRECT  }
+            ).records.first { it.groupId == groupId || it.joinedType == JoinedType.DIRECT }
         )
     }