|
@@ -146,9 +146,11 @@ public class ProjectAlarmRuleController {
|
|
|
&& projectAlarmRuleObjRel.getObjName().contains(equipName)
|
|
|
&& projectAlarmRuleObjRel.getOpen() == 1) {
|
|
|
projectAlarmRuleListItemVO.setRelListItemList(query);
|
|
|
- result.add(projectAlarmRuleListItemVO);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
+ if (null != projectAlarmRuleListItemVO.getRelListItemList())
|
|
|
+ result.add(projectAlarmRuleListItemVO);
|
|
|
} else {
|
|
|
projectAlarmRuleListItemVO.setRelListItemList(query);
|
|
|
result.add(projectAlarmRuleListItemVO);
|
|
@@ -171,7 +173,9 @@ public class ProjectAlarmRuleController {
|
|
|
for (ProjectAlarmRule projectAlarmRule : projectAlarmRuleList) {
|
|
|
ProjectAlarmRuleWithObjsAndInfoCodes projectAlarmRuleWithObjsAndInfoCodes =
|
|
|
convert2ProjectAlarmRuleWithObjsAndInfoCodes(projectAlarmRule);
|
|
|
- if (projectAlarmRuleWithObjsAndInfoCodes == null) {continue;}
|
|
|
+ if (projectAlarmRuleWithObjsAndInfoCodes == null) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
resultList.add(projectAlarmRuleWithObjsAndInfoCodes);
|
|
|
}
|