From ce0290ea0359582f08c7a14c08555554d2813d0b Mon Sep 17 00:00:00 2001 From: tjq Date: Mon, 3 Oct 2022 15:47:47 +0800 Subject: [PATCH] fix: front-end NPE #455 --- .../java/tech/powerjob/server/web/response/JobInfoVO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java index a9d59af2..f100474c 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java @@ -2,6 +2,7 @@ package tech.powerjob.server.web.response; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import tech.powerjob.common.enums.ExecuteType; import tech.powerjob.common.enums.ProcessorType; import tech.powerjob.common.enums.TimeExpressionType; @@ -16,7 +17,6 @@ import tech.powerjob.server.persistence.remote.model.JobInfoDO; import com.google.common.collect.Lists; import lombok.Data; import org.springframework.beans.BeanUtils; -import org.springframework.util.StringUtils; import java.util.Date; import java.util.List; @@ -180,6 +180,8 @@ public class JobInfoVO { if (!StringUtils.isEmpty(jobInfoDO.getAlarmConfig())){ jobInfoVO.setAlarmConfig(JSON.parseObject(jobInfoDO.getAlarmConfig(),AlarmConfig.class)); + } else { + jobInfoVO.setAlarmConfig(new AlarmConfig()); } if (!StringUtils.isEmpty(jobInfoDO.getLifecycle())){ jobInfoVO.setLifeCycle(LifeCycle.parse(jobInfoDO.getLifecycle()));