10/10 novelty

src/main/java/cn/cslg/pas/service/novelty/NoveltySearchRecordService.java

@@ -62,9 +62,8 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
     public Records querySearchRecord(QuerySearchRecordDTO querySearchRecordDTO) throws IOException {
         Long total = null;
         Records records = new Records();
-        Long size = querySearchRecordDTO.getSize() != null ? querySearchRecordDTO.getSize() : 10;
-        Long current = querySearchRecordDTO.getCurrent() != null ? querySearchRecordDTO.getCurrent() : 0;
-
+        Long size = querySearchRecordDTO.getSize();
+        Long current = querySearchRecordDTO.getCurrent();
         Integer projectId = querySearchRecordDTO.getProjectId();
         List<RetrieveRecord> retrieveRecordList = new ArrayList<>();
         List<RetrieveRecordVO> retrieveRecordVOS = new ArrayList<>();
@@ -83,14 +82,18 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
                 queryWrapper.in(RetrieveRecord::getId, retrieveIds)
                         .orderByDesc(RetrieveRecord::getRetrieveTime)
                         .orderByDesc(RetrieveRecord::getCreateTime);
-
-                IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(current, size), queryWrapper);
-                retrieveRecordList = retrieveRecords.getRecords();
-
+                if (current != null && size != null) {
+                    IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(current, size), queryWrapper);
+                    retrieveRecordList = retrieveRecords.getRecords();
+                    total = retrieveRecords.getTotal();
+                } else {
+                    retrieveRecordList = this.list(queryWrapper);
+                    total = (long) retrieveRecordList.size();
+                }
                 if (!retrieveRecordList.isEmpty()) {
                     retrieveRecordVOS = this.loadRetrieveRecords(retrieveRecordList, assoRetrieveRecordProjects);
                 }
-                total = retrieveRecords.getTotal();
+
             }
         }