Merge remote-tracking branch 'origin/developer' into developer

byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java

@@ -347,8 +347,13 @@ public class ApiNodeServiceImpl implements ApiNodeService {
         if(null != javaTask.getRepeatCount() && -1 != javaTask.getRepeatCount()){
             javaTask.setRemainingCount(javaTask.getRemainingCount());
         }
-        if (null != javaTask.getAlarmlAction() && "0".equals(javaTask.getAlarmlAction())){
-            ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空");
+        //设置为不告警
+        if (null != javaTask.getAlarmlAction() && !"0".equals(javaTask.getAlarmlAction())){
+            //邮箱为空
+            if(StringUtils.isBlank(javaTask.getAlarmEmail())){
+                ValidationUtil.dataNotBank(javaTask.getAlarmEmail(), "设置为告警时告警邮箱不允许为空");
+            }
+
         }
         return javaTask;
     }