Browse Source

解决项目监测指标配置列表bug

lixing 3 years ago
parent
commit
f7091d4180

+ 3 - 1
src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java

@@ -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()));

File diff suppressed because it is too large
+ 1 - 1
src/main/resources/db/init/table.sql