fix(jg):登记证相关接口查询【已认领】设备

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/JgUseRegistrationManageServiceImpl.java

@@ -336,14 +336,14 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     /**
-     * 根据证的sequenceNbr，查询证下面的所有设备
+     * 根据证的sequenceNbr，查询证下面的所有【已认领】设备
      */
     public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) {
         return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr));
     }
 
     /**
-     * 根据证的sequenceNbr集合，批量查询证下面的所有设备
+     * 根据证的sequenceNbr集合，批量查询证下面的所有【已认领】设备
      */
     public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
@@ -367,6 +367,12 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         // builder.query(boolQuery);
         // builder.size(useOrgCodes.size());
         // request.source(builder);
+        BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
+        meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
+        meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
+        meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
+        meBuilder.minimumShouldMatch(1);
+        boolQuery.must(meBuilder);
 
         List<JSONObject> result = Collections.emptyList();
         try {