fixed

src/main/java/cn/cslg/pas/common/dto/GetAllPersonDTO.java

@@ -11,10 +11,14 @@ public class GetAllPersonDTO {
 
     private String name;
 
+    private String abbreviation;
+
     private String address;
 
     private String country;
 
+    private String province;
+
     private String remark;
 
     //类型  0 申请人  1 权利人  2 发明人

src/main/java/cn/cslg/pas/controller/CustomFieldController.java

@@ -145,4 +145,13 @@ public class CustomFieldController {
         records.setData(list);
         return Response.success(records);
     }
+
+    @PostMapping("/select")
+    @Operation(summary = "标引/批量标引添加")
+    public Response select(@RequestBody EsCustomFieldBatchVO vo) throws Exception {
+        List<String> list = esCustomFieldService.getPatentNos(vo);
+        Records records = new Records();
+        records.setData(list);
+        return Response.success(records);
+    }
 }

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

@@ -556,6 +556,8 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                 merge.setRemark(person.getRemark());
                 merge.setType(personType);
                 merge.setMergeId(person.getId());
+                merge.setAbbreviation(person.getAbbreviation());
+                merge.setProvince(person.getProvince());
                 mergeList.add(merge);
 
                 if (personType == 0) {

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

@@ -314,8 +314,14 @@ public class EsCustomFieldService {
         Integer projectId = vo.getProjectId();
         Integer startNum = vo.getStartNumber();
         Integer endNum = vo.getEndNumber();
-        List<String> isAdd = vo.getIsAdd();
-        List<String> isDel = vo.getIsDelete();
+        List<String> isAdd = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(vo.getIsAdd())) {
+            isAdd = vo.getIsAdd();
+        }
+        List<String> isDel = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(vo.getIsDelete())) {
+            isDel = vo.getIsDelete();
+        }
         String searchCondition = "";
         if (StringUtils.isNotEmpty(vo.getSearchQuery())) {
             searchCondition = vo.getSearchQuery();
@@ -348,9 +354,12 @@ public class EsCustomFieldService {
         //3. 从es中检索数据
         Query q = formatQueryService.EsQueryToQuery((operateNode) tree, "patent");
         builder.query(q);
-        if (startNum > 0 && endNum > 0) {
-            builder.from(startNum-1).size(endNum);
+
+        int number = endNum - startNum;
+        if (startNum > 0 && endNum > startNum) {
+            builder.from(startNum-1).size(number);
         }
+
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         List<String> patentNos = new ArrayList<>();