Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -569,9 +569,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-        meBuilder.must(QueryBuilders.boolQuery()
-                .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")))
-                .should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", ""))));
+        meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
+        meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
+        meBuilder.minimumShouldMatch(1);
         boolMust.must(meBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
@@ -637,7 +637,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
             String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
             useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
-            ubuilder.should(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", useCode));
+            ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
 
             String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
             ubuilder.should(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
@@ -649,7 +649,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
                 String param = QueryParser.escape(uucc);
                 param = param.contains("_") ? param.split("_")[0] : param;
-                uuccBuilder.must(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", param));
+                uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
                 boolMust.must(uuccBuilder);
             }
             if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {