fixed

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

@@ -24,7 +24,7 @@ public class GetAllPersonDTO {
     //类型  0 申请人  1 权利人  2 发明人
     private Integer type;
 
-    //合并标识
+    //合并标识id
     private Integer mergeId;
 
 }

src/main/java/cn/cslg/pas/common/vo/business/MergePersonAgainVO.java

@@ -6,9 +6,9 @@ import java.util.List;
 
 @Data
 public class MergePersonAgainVO {
-    //已存在的合并后名称
+    //已合并后的名称
     private List<String> needMergedName;
-    //存在再次要合并的名称
+    //需要再次合并的名称
     private List<String> mergedName;
 
     private Integer projectId;

src/main/java/cn/cslg/pas/common/vo/business/MergePersonVO.java

@@ -49,4 +49,6 @@ public class MergePersonVO {
      * 备注
      */
     private String remark;
+
+    private List<String> delNames;
 }

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

@@ -231,7 +231,7 @@ public class PatentController {
     }
 
     @Operation(summary = "发明人/权利人/申请人合并列表查询")
-    @PostMapping("/selectMergePerson")
+//    @PostMapping("/selectMergePerson")
     public Response selectMergePerson(@RequestBody MergePersonQueryVO vo) {
         Records records = mergePersonService.selectMergePersonList(vo);
         return Response.success(records);

src/main/java/cn/cslg/pas/domain/es/PatentMergePerson.java

@@ -26,4 +26,10 @@ public class PatentMergePerson {
      */
     @JsonProperty("project_id")
     String projectId;
+
+    @JsonProperty("if_merged")
+    Boolean ifMerged = false;
+
+    @JsonProperty("merged_num")
+    Integer mergedNum = 1;
 }

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

@@ -179,7 +179,7 @@ public class EsPatentService {
     public List<String> loadMergeName(List<PatentMergePerson> list) {
         List<String> collect = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
-            collect = list.stream().map(PatentMergePerson::getName).collect(Collectors.toList());
+            collect = list.stream().map(PatentMergePerson::getName).distinct().collect(Collectors.toList());
         }
         return collect;
     }

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -262,8 +262,12 @@ public class PatentStarApiService {
     }
 
     private boolean containsNumber(PatentColumnDTO dto, String number) {
-        return dto.getAppNo().contains(number) || dto.getPublicNo().contains(number)
-                || dto.getGrantNo().contains(number) || dto.getRowApplicationNo().contains(number);
+        String appNo = StringUtils.isNotEmpty(dto.getAppNo()) ? dto.getAppNo() : "";
+        String publicNo = StringUtils.isNotEmpty(dto.getPublicNo()) ? dto.getPublicNo() : "";
+        String grantNo = StringUtils.isNotEmpty(dto.getGrantNo()) ? dto.getGrantNo() : "";
+        String rowAppNo = StringUtils.isNotEmpty(dto.getRowApplicationNo()) ? dto.getRowApplicationNo() : "";
+        return appNo.contains(number) || publicNo.contains(number)
+                || grantNo.contains(number) || rowAppNo.contains(number);
     }
 
     private List<PatentColumnDTO> createNewDTOs(List<String> list) {