fixed

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

@@ -289,6 +289,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         Query bool = QueryBuilders.bool(i -> i.must(q, query));
         builder.query(bool);
 
+        builder.trackTotalHits(i -> i.enabled(true));
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         List<Hit<Patent>> hits = response.hits().hits();
         Map<String, List<PatentMergePerson>> map = new HashMap<>();
@@ -1070,13 +1071,18 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                         Map<String, List<PatentMergePerson>> rightMap = this.getChildMergePerson(id, projectId, "merge_right_holder");
                         if (!CollectionUtils.isEmpty(rightMap)) {
                             for (String rightId : rightMap.keySet()) {
-                                if (CollectionUtils.isEmpty(nameDatas)) {
-                                    this.delSingleMerge(rightId, type, name);
-                                }
+//                                if (CollectionUtils.isEmpty(nameDatas)) {
+//                                    this.delSingleMerge(rightId, type, name);
+//                                }
 
                                 ArrayList<PatentMergePerson> rightMergeList = new ArrayList<>(mergePersonList);
                                 List<PatentMergePerson> rightList = rightMap.get(rightId);
                                 rightMergeList.addAll(rightList);
+                                if (CollectionUtils.isEmpty(nameDatas)) {
+                                    if (!CollectionUtils.isEmpty(rightMergeList)) {
+                                        rightMergeList.removeIf(right -> right.getName().equals(name));
+                                    }
+                                }
                                 //添加子文档
                                 Patent newPatent = new Patent();
                                 PatentJoin patentJoin = new PatentJoin();

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

@@ -334,7 +334,10 @@ public class EsPatentService {
         String guids = fileManagerService.getPatentPictureGuids(appNo);
         if (StringUtils.isNotEmpty(guids)) {
             JSONObject jsonObject = JSONObject.parseObject(guids);
-            list = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
+            String data = jsonObject.get("data").toString();
+            if (StringUtils.isNotEmpty(data)) {
+                list = JSONArray.parseArray(data, String.class);
+            }
         }
         return list;
     }