转换10

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());//开始时间