Merge pull request #63 from mingshewhe/bug_62

bug: 获取用户组成员接口分页传参错误 #62
TencentBlueKing · Aug 24, 2023 · ebbe106 · ebbe106
2 parents b937423 + e4c390e
commit ebbe106
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ ext {
     set("junitVersion", "5.4.2")
 
     if (System.getProperty("snapshot") == "true") {
-        set('iamVersion', "1.0.30-SNAPSHOT")
+        set('iamVersion', "1.0.31-SNAPSHOT")
     } else {
         set('iamVersion', "1.0.0")
     }

diff --git a/src/main/java/com/tencent/bk/sdk/iam/service/v2/V2ManagerService.java b/src/main/java/com/tencent/bk/sdk/iam/service/v2/V2ManagerService.java
@@ -175,7 +175,7 @@ public GradeManagerApplicationResponse updateGradeManagerApplication(String grad
     /**
      * 用户组成员列表
      */
-    public ManagerGroupMemberVo getRoleGroupMemberV2(Integer groupId, PageInfoDTO pageInfoDTO);
+    public ManagerGroupMemberVo getRoleGroupMemberV2(Integer groupId, V2PageInfoDTO pageInfoDTO);
 
     /**
      * 用户组成员续期(不需要审批版本)

diff --git a/src/main/java/com/tencent/bk/sdk/iam/service/v2/impl/V2ManagerServiceImpl.java b/src/main/java/com/tencent/bk/sdk/iam/service/v2/impl/V2ManagerServiceImpl.java
@@ -211,8 +211,8 @@ public void deleteRoleGroupMemberV2(Integer groupId, String type, String members
     }
 
     @Override
-    public ManagerGroupMemberVo getRoleGroupMemberV2(Integer groupId, PageInfoDTO pageInfoDTO) {
-        String url = buildURLPage(String.format(V2IamUri.V2_MANAGER_ROLE_GROUP_MEMBER_GET, iamConfiguration.getSystemId(), groupId), pageInfoDTO);
+    public ManagerGroupMemberVo getRoleGroupMemberV2(Integer groupId, V2PageInfoDTO pageInfoDTO) {
+        String url = v2BuildURLPage(String.format(V2IamUri.V2_MANAGER_ROLE_GROUP_MEMBER_GET, iamConfiguration.getSystemId(), groupId), pageInfoDTO);
         try {
             String responseStr = apigwHttpClientService.doHttpGet(url);
             if (StringUtils.isNotBlank(responseStr)) {

diff --git a/src/test/java/com/tencent/bk/sdk/iam/service/v2/impl/V2ManagerServiceTest.java b/src/test/java/com/tencent/bk/sdk/iam/service/v2/impl/V2ManagerServiceTest.java
@@ -136,9 +136,9 @@ public void testVerifyGroupValidMember() {
 
     @Test
     public void testV2GetRoleGroupMember() {
-        PageInfoDTO pageInfoDTO = new PageInfoDTO();
-        pageInfoDTO.setLimit(1L);
-        pageInfoDTO.setOffset(0L);
+        V2PageInfoDTO pageInfoDTO = new V2PageInfoDTO();
+        pageInfoDTO.setPageSize(1);
+        pageInfoDTO.setPage(0);
         ManagerGroupMemberVo managerGroupMemberVo = v2ManagerService.getRoleGroupMemberV2(10031, pageInfoDTO);
         System.out.println(managerGroupMemberVo);
     }