Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -968,7 +968,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
         });
 
 
-        Integer current = 0;
+        Integer current = 1;
         for (PersonAssignedDTO item : personAssignedDTOList) {
             List<String> addPatentNos = new ArrayList<>();
             //创建任务

src/main/java/cn/cslg/pas/service/business/es/EsPatentService.java

@@ -620,6 +620,8 @@ public class EsPatentService {
     public List<Patent> getPatentsWithNotNo(QueryRequest queryRequest, List<String> patentNos) throws Exception {
         List<Patent> patentList = new ArrayList<>();
         SearchRequest.Builder builder = new SearchRequest.Builder();
+        Long current =queryRequest.getCurrent();
+        Long size =queryRequest.getSize();
         //设置查询索引
         builder.index("patent");
         Query q = this.getQuery(queryRequest);
@@ -633,7 +635,9 @@ public class EsPatentService {
         }
         //4. 返回数据
         builder.query(reQuery);
-
+        if (current > 0 && size > 0) {
+            builder.from(current.intValue() - 1).size(size.intValue());
+        }
         List<String> reSources = this.rePatentSource();
         builder.source(sourceOptionsBuilder -> sourceOptionsBuilder
                 .filter(fieldSourceBuilder -> fieldSourceBuilder