Merge pull request #52 from WeBankFinTech/release/1.2.29

Release/1.2.29
WeBankBlockchain · Apr 12, 2021 · fb99ba6 · fb99ba6
2 parents 40b10ee + 9203d4b
commit fb99ba6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/contracts/AuthorityIssuerController.sol b/contracts/AuthorityIssuerController.sol
@@ -80,6 +80,10 @@ contract AuthorityIssuerController {
         AuthorityIssuerRetLog(OPERATION_REMOVE, result, addr);
     }
 
+    function getTotalIssuer() public constant returns (uint) {
+        return authorityIssuerData.getDatasetLength();
+    }
+
     function getAuthorityIssuerAddressList(
         uint startPos,
         uint num

diff --git a/contracts/CptController.sol b/contracts/CptController.sol
@@ -443,7 +443,7 @@ contract CptController {
         }
         uint[] memory result = new uint[](dataLength);
         for (uint i = 0; i < dataLength; i++) {
-            result[i] = cptData.getCptIdFromIndex(i);
+            result[i] = cptData.getCptIdFromIndex(startPos + i);
         }
         return result;
     }
@@ -465,7 +465,7 @@ contract CptController {
         }
         uint[] memory result = new uint[](dataLength);
         for (uint i = 0; i < dataLength; i++) {
-            result[i] = cptData.getCptIdFromIndex(i);
+            result[i] = cptData.getCptIdFromIndex(startPos + i);
         }
         return result;
     }