最后一页数据查询为空不在接口处理

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/PaperController.java

@@ -283,14 +283,14 @@ public class PaperController extends ControllerSupport {
         if (StringUtils.isNotBlank(ids)) {
         	String[] idArr=ids.split(",");
             ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage, pageSize, PaperType.GENERATE,ud);
-            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
-                ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage - 1, pageSize, PaperType.GENERATE,ud);
-            }
+//            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
+//                ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage - 1, pageSize, PaperType.GENERATE,ud);
+//            }
         } else {
             ret = paperService.getGenPapers(paperSearchInfo, curPage, pageSize,ud);
-            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
-                ret = paperService.getGenPapers(paperSearchInfo, curPage - 1, pageSize,ud);
-            }
+//            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
+//                ret = paperService.getGenPapers(paperSearchInfo, curPage - 1, pageSize,ud);
+//            }
         }
         if(ret!=null&&CollectionUtils.isNotEmpty(ret.getContent())
         		&&paperSearchInfo.getFillCount()!=null&&paperSearchInfo.getFillCount()) {
@@ -633,14 +633,14 @@ public class PaperController extends ControllerSupport {
         if (StringUtils.isNotBlank(ids)) {
         	String[] idArr=ids.split(",");
             ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage, pageSize, PaperType.IMPORT,ud);
-            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
-                ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage - 1, pageSize, PaperType.IMPORT,ud);
-            }
+//            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
+//                ret = paperService.getPapersNotInIds(paperSearchInfo, idArr, curPage - 1, pageSize, PaperType.IMPORT,ud);
+//            }
         } else {
             ret = paperService.getImportPapers(paperSearchInfo, curPage, pageSize,ud);
-            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
-                ret = paperService.getImportPapers(paperSearchInfo, curPage - 1, pageSize,ud);
-            }
+//            if (ret.getContent().size() == 0 && ret.getTotalElements() > 0 && curPage > 1) {
+//                ret = paperService.getImportPapers(paperSearchInfo, curPage - 1, pageSize,ud);
+//            }
         }
         if(ret!=null&&CollectionUtils.isNotEmpty(ret.getContent())
         		&&paperSearchInfo.getFillCount()!=null&&paperSearchInfo.getFillCount()) {