fixed

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

@@ -234,8 +234,8 @@ public class EsPatentService {
         List<PatentMergePerson> list = new ArrayList<>();
         for (Hit<Patent> hit : hits) {
             Patent patent = hit.source();
-            if (!CollectionUtils.isEmpty(patent.getMergeApplicant())) {
-                list.addAll(patent.getMergeApplicant());
+            if (!CollectionUtils.isEmpty(patent.getMergeRightHolder())) {
+                list.addAll(patent.getMergeRightHolder());
             }
         }
         List<String> data = new ArrayList<>();
@@ -263,8 +263,8 @@ public class EsPatentService {
         List<PatentMergePerson> list = new ArrayList<>();
         for (Hit<Patent> hit : hits) {
             Patent patent = hit.source();
-            if (!CollectionUtils.isEmpty(patent.getMergeApplicant())) {
-                list.addAll(patent.getMergeApplicant());
+            if (!CollectionUtils.isEmpty(patent.getMergeInventor())) {
+                list.addAll(patent.getMergeInventor());
             }
         }
         List<String> data = new ArrayList<>();

src/main/resources/jsons/patent.json

@@ -294,8 +294,8 @@
     "field": "GFT",
     "esField": "grant_full_text.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "true",
-    "ifGroup": "true",
+    "ifSearch": "false",
+    "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -403,7 +403,7 @@
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "address"
@@ -417,7 +417,7 @@
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -431,7 +431,7 @@
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -445,7 +445,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -459,7 +459,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -473,7 +473,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -487,7 +487,7 @@
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "address"
@@ -501,7 +501,7 @@
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -515,7 +515,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -529,7 +529,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -543,7 +543,7 @@
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
-    "ifShow": "false",
+    "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "nation"
   },