From 3d236692cf8481dae9154f83aad1643ca29af1b7 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Mon, 15 Jul 2024 11:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A210?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/service/impl/DcWarningServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
index 0f823ab8..aae7c5e4 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
@@ -496,8 +496,8 @@ public class DcWarningServiceImpl implements IDcWarningService
         if (dcWarning.getWarningSubclass()!=null&&warningType!=UniversalEnum.SEVEN.getNumber()&& warningType!=UniversalEnum.TEN.getNumber()) {
             dcEvent.setEventSubclass(ValueConverter.convertValueSon(dcWarning.getWarningSubclass()));//事件子类(7与10不转)
         }
-        if (dcWarning.getWarningSubclass()!=null&&(warningType==UniversalEnum.SEVEN.getNumber()|| warningType==UniversalEnum.TEN.getNumber())){
-            dcEvent.setEventSubclass(dcWarning.getWarningSubclass());//事件子类(7与10主类对应的子类直接set)
+        if (dcWarning.getWarningSubclass()!=null&&(warningType==UniversalEnum.SEVEN.getNumber())){
+            dcEvent.setEventSubclass(dcWarning.getWarningSubclass());//事件子类(7主类对应的子类直接set)
         }
         dcEvent.setOccurrenceTime(dcWarning.getWarningTime());//发生时间
         dcEvent.setStartTime(DateUtils.getNowDate());//开始时间