易涛 пре 3 година
родитељ
комит
da1b41dd3d

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

@@ -163,6 +163,9 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         List<GroupTreeInfoVO> groupTreeInfoVOList = Lists.newArrayList();
         List<GroupManagement> groupManagementList = findEquipsByIds(ids);
         for(GroupManagement management:groupManagementList) {
+            if(StringUtils.isEmpty(management.getInfos())){
+                return null;
+            }
             String infos = management.getInfos().replace(DELIM_START,"")
                     .replace(DELIM_END,"").replace("\"","")
                     .replace(BACKSLASH,"").replace(" ","")
@@ -195,6 +198,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
             if(StringUtils.isNotEmpty(infoVO.getId())){
                 return infoVO;
             }
+            //排除掉配置的时候存在不小心放入空格的情况
             if(infoMap.containsKey(groupTreeVO.getCondition().replace(" ",""))){
                 BeanUtils.copyProperties(groupTreeVO,infoVO);
                 infoVO.setEquipId(equipId);