Merge pull request #302 from qiaozhanwei/branch-1.0.2

work tolerance update

Merge pull request #302 from qiaozhanwei/branch-1.0.2
work tolerance update
0ee5bfc4 · journey2018 · GitHub · 1e9299cd · ad18251c · 0ee5bfc4
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java ...rc/main/java/cn/escheduler/server/utils/AlertManager.java +1 -1

未找到文件。
--- a/escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java
+++ b/escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java
@@ -175,7 +175,7 @@ public class AlertManager {
        alert.setContent(content);
        alert.setAlertType(AlertType.EMAIL);
        alert.setCreateTime(new Date());
-        alert.setAlertGroupId(processInstance.getWarningGroupId());
+        alert.setAlertGroupId(processInstance.getWarningGroupId() == null ? 1:processInstance.getWarningGroupId());
        alert.setReceivers(processInstance.getProcessDefinition().getReceivers());
        alert.setReceiversCc(processInstance.getProcessDefinition().getReceiversCc());