Merge pull request #279 from WeBankFinTech/release/1.7.0

Release/1.7.0
WeBankBlockchain · Nov 20, 2020 · 1e61bff · 1e61bff
2 parents e9c35d1 + f71f9c0
commit 1e61bff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.7
+1.7.0
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-        compile("com.webank:weid-contract-java:1.2.27-rc.8-SNAPSHOT") {
+        compile("com.webank:weid-contract-java:1.2.27") {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
         }
         compile fileTree(dir: 'lib', include: '*.jar')

diff --git a/src/main/java/com/webank/weid/service/impl/engine/fiscov2/WeIdServiceEngineV2.java b/src/main/java/com/webank/weid/service/impl/engine/fiscov2/WeIdServiceEngineV2.java
@@ -696,6 +696,12 @@ public ResponseData<List<WeIdPojo>> getWeIdList(
         boolean direction
     ) throws Exception {
         LinkedList<WeIdPojo> result = new LinkedList<WeIdPojo>();
+        if (pageSize == null || indexInBlock == null || blockNumber == null) {
+            return new ResponseData<>(result, ErrorCode.ILLEGAL_INPUT);
+        }
+        if (pageSize <= 0) {
+            return new ResponseData<>(result, ErrorCode.SUCCESS);
+        }
         // 处理块高
         Integer firstBlockNumer = this.getFirstBlockNum();
         Integer latestBlockNumer = this.getLatestBlockNum();
@@ -726,7 +732,7 @@ public ResponseData<List<WeIdPojo>> getWeIdList(
                 } else {
                     // 没换块
                     // 如果index大于当前块最大位置 则index为当前最大位置
-                    if (beginIndex > weIdListByBlockNumber.size()) {
+                    if (beginIndex > weIdListByBlockNumber.size() - 1) {
                         beginIndex = weIdListByBlockNumber.size() - 1;
                     }
                 }
@@ -764,7 +770,7 @@ public ResponseData<List<WeIdPojo>> getWeIdList(
                     if (beginIndex < 0) {
                         beginIndex = 0;
                     }
-                    if (beginIndex > weIdListByBlockNumber.size()) {
+                    if (beginIndex > weIdListByBlockNumber.size() - 1) {
                         // 换块
                         queryBlockNumber = this.getNextBlockNum(queryBlockNumber);
                         changeBlock = true;