Browse Source

逻辑调整

chengyao 4 years ago
parent
commit
050de26b94
1 changed files with 7 additions and 1 deletions
  1. 7 1
      src/main/java/com/diagbot/facade/ConsoleFacade.java

+ 7 - 1
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -3051,8 +3051,14 @@ public class ConsoleFacade {
             current = 1;
         }
         int startIndex = ((int)current -1)*10;
+        int endIndex = startIndex + (int) size;
+
         if(retRecords.size()>1){
-        retRecords = retRecords.subList(startIndex, startIndex+(int)size);
+            if( retRecords.size()-startIndex<retRecords.size()){
+                retRecords = retRecords.subList(startIndex,retRecords.size());
+            }else{
+                retRecords = retRecords.subList(startIndex,endIndex );
+            }
         }
         retPage.setRecords(retRecords);
         return retPage;