diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java index db0ce64a..f2c2c768 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmAnalysisRuleServiceImpl.java @@ -153,9 +153,9 @@ public class AlarmAnalysisRuleServiceImpl extends ServiceImpl<AlarmAnalysisRuleM String id = alarmAnalysisRule.getId(); String name = alarmAnalysisRule.getName(); String original = getById(id).getName(); - if (null != alarmAnalysisRule.getIdentifyNuclides()) { + if (null != alarmAnalysisRule.getIdentifyNuclides() && !alarmAnalysisRule.getConditions().contains("4")) { alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions() + ",4"); - } else { + } else if(null == alarmAnalysisRule.getIdentifyNuclides() && !alarmAnalysisRule.getConditions().contains("4")) { alarmAnalysisRule.setConditions(alarmAnalysisRule.getConditions().replace("4", "")); } if (!StrUtil.equalsIgnoreCase(name,original)){