From 635545cb86bd18f0d808d5e8f2c0a35f0190f228 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 9 Jan 2025 14:17:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B8=E7=B4=A0=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=20=E5=A2=9E=E5=8A=A0=E6=A0=B8=E7=B4=A0?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=8A=A5=E8=AD=A6=EF=BC=8C=E6=B1=82=E5=B9=B3?=
 =?UTF-8?q?=E5=9D=87=E5=80=BC=E7=9A=84=E5=91=A8=E6=9C=9F=E5=92=8C=E7=B3=BB?=
 =?UTF-8?q?=E6=95=B0=E9=83=BD=E6=95=B4=E5=90=88=E5=88=B0=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/service/impl/AlarmAnalysisRuleServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)){