|
@@ -72,7 +72,9 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
List<GroupManagementVo> groupManagementVoList = new ArrayList<>();
|
|
|
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
|
|
|
queryBuilder.must(QueryBuilders.matchQuery("class_code", managementDTO.getClassCode()));
|
|
|
- queryBuilder.must(QueryBuilders.matchPhraseQuery("infos", managementDTO.getCondition()));
|
|
|
+ if (StringUtils.isNotBlank(managementDTO.getCondition())) {
|
|
|
+ queryBuilder.must(QueryBuilders.matchPhraseQuery("infos", managementDTO.getCondition()));
|
|
|
+ }
|
|
|
//新增根据项目id查询设备
|
|
|
if (StringUtils.isNotEmpty(managementDTO.getProjectId())) {
|
|
|
queryBuilder.must(QueryBuilders.matchQuery("project_id", managementDTO.getProjectId()));
|