|
@@ -68,6 +68,10 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
|
|
|
queryBuilder.must(QueryBuilders.matchQuery("class_code",managementDTO.getClassCode()));
|
|
|
queryBuilder.must(QueryBuilders.matchPhraseQuery("infos",managementDTO.getCondition()));
|
|
|
+ //新增根据项目id查询设备
|
|
|
+ if(StringUtils.isNotEmpty(managementDTO.getProjectId())){
|
|
|
+ queryBuilder.must(QueryBuilders.termsQuery("project_id",managementDTO.getProjectId()));
|
|
|
+ }
|
|
|
//模糊查询使用
|
|
|
if(StringUtils.isNotEmpty(managementDTO.getLocalName())) {
|
|
|
queryBuilder.must(QueryBuilders.matchQuery("local_name", managementDTO.getLocalName())
|