Merge branch 'develop_tzs_register' of…

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

@@ -1181,22 +1181,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         String queryType = map.getString("QUERY_TYPE");
         if (!ObjectUtils.isEmpty(queryType)) {
-            //查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null】
+            // 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null ||  ""】
             if (ValidationUtil.equals(queryType, "AZ")) {
-                BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
-                azBuilder.mustNot(QueryBuilders.existsQuery("USE_UNIT_CREDIT_CODE"));
-                boolMust.must(azBuilder);
+                BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
+                        .mustNot(QueryBuilders.wildcardQuery("USE_UNIT_CREDIT_CODE", "*"));
+                boolMust.must(nullOrEmptyQuery);
             } else if (ValidationUtil.equals(queryType, "WB")) {
-                // 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null）】
-                BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
-                wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
-                boolMust.must(wbBuilder);
+                // 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null ||  ""）】
+                BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
+                        .mustNot(QueryBuilders.wildcardQuery("EQU_STATE", "*"));
+                boolMust.must(nullOrEmptyQuery);
             } else if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
-                //查询 使用登记【可选设备列表】【EQU_STATUS=== null && (USE_ORG_CODE ==="" || null)】
-                BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
-                syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
-                syBuilder.mustNot(QueryBuilders.existsQuery("USE_ORG_CODE"));
-                boolMust.must(syBuilder);
+                // 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE ==="" || null)】
+                BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
+                        .mustNot(QueryBuilders.wildcardQuery("EQU_STATE", "*"))
+                        .mustNot(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
+                boolMust.must(nullOrEmptyQuery);
             }
         }
 
@@ -1315,6 +1315,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
             boolMust.must(pBuilder);
         }
+        System.err.println(boolMust);
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);