feat：支持管理员查看项目成员 TencentBlueKing#9620

dao层开发
mingshewhe · Jul 1, 2024 · f8a8090 · f8a8090
1 parent beef262
commit f8a8090
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ore/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroupMember.kt b/...ore/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/AuthResourceGroupMember.kt
@@ -40,7 +40,7 @@ data class AuthResourceGroupMember(
     @get:Schema(title = "资源ID", required = true)
     val resourceCode: String,
     @get:Schema(title = "权限中心组ID", required = true)
-    val iamGroupId: Long,
+    val iamGroupId: Int,
     @get:Schema(title = "成员ID, 用户: 英文名, 组织: 组织ID, 人员模板: 模板ID", required = true)
     val memberId: String,
     @get:Schema(title = "成员名", required = true)

diff --git a/...e/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupMemberDao.kt b/...e/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/dao/AuthResourceGroupMemberDao.kt
@@ -43,7 +43,7 @@ class AuthResourceGroupMemberDao {
         projectCode: String,
         resourceType: String,
         resourceCode: String,
-        iamGroupId: Long,
+        iamGroupId: Int,
         memberId: String,
         memberName: String,
         memberType: String,
@@ -84,7 +84,7 @@ class AuthResourceGroupMemberDao {
     fun update(
         dslContext: DSLContext,
         projectCode: String,
-        iamGroupId: Long,
+        iamGroupId: Int,
         memberId: String,
         memberName: String,
         expiredTime: LocalDateTime
@@ -157,14 +157,14 @@ class AuthResourceGroupMemberDao {
         }
     }
 
-    fun listAllMember(
+    fun listResourceMember(
         dslContext: DSLContext,
         projectCode: String,
         resourceType: String? = null,
         memberId: String? = null,
         memberName: String? = null,
         memberType: String? = null,
-        iamGroupId: Long? = null
+        iamGroupId: Int? = null
     ): List<AuthResourceGroupMember> {
         return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) {
             val select = dslContext.selectFrom(this)
@@ -184,7 +184,7 @@ class AuthResourceGroupMemberDao {
     fun listGroupMember(
         dslContext: DSLContext,
         projectCode: String,
-        iamGroupId: Long
+        iamGroupId: Int
     ): List<AuthResourceGroupMember> {
         return with(TAuthResourceGroupMember.T_AUTH_RESOURCE_GROUP_MEMBER) {
             dslContext.selectFrom(this)
@@ -199,7 +199,7 @@ class AuthResourceGroupMemberDao {
     /**
      * 获取成员按资源类型分组数量
      */
-    fun countMemberResourceType(
+    fun countMemberGroup(
         dslContext: DSLContext,
         projectCode: String,
         memberType: String,
@@ -220,7 +220,7 @@ class AuthResourceGroupMemberDao {
     /**
      * 获取成员按资源类型下用户组列表
      */
-    fun listMemberResourceGroup(
+    fun listMemberGroupDetail(
         dslContext: DSLContext,
         projectCode: String,
         memberType: String,