diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java index e3011ae85..5e640c201 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Job.java @@ -3,9 +3,7 @@ package com.aizuda.snailjob.template.datasource.persistence.po; import com.aizuda.snailjob.common.core.enums.ExecutorTypeEnum; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; /** @@ -150,6 +148,7 @@ public class Job extends CreateUpdateDt { /** * 负责人id */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private Long ownerId; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java index c721d0134..0a4720726 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/JobConverter.java @@ -46,7 +46,7 @@ public interface JobConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java index f47decdfd..251310d7d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/SceneConfigConverter.java @@ -45,7 +45,7 @@ public interface SceneConfigConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java index fd8011328..082c2869a 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/WorkflowConverter.java @@ -120,7 +120,7 @@ public interface WorkflowConverter { static String toNotifyIdsStr(Set notifyIds) { if (CollUtil.isEmpty(notifyIds)) { - return null; + return StrUtil.EMPTY; } return JsonUtil.toJsonString(notifyIds); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java index 4f1907da2..055e0edbb 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java @@ -153,7 +153,6 @@ public class SceneConfigServiceImpl implements SceneConfigService { retrySceneConfig.setTriggerInterval( Optional.ofNullable(retrySceneConfig.getTriggerInterval()).orElse(StrUtil.EMPTY)); - retrySceneConfig.setNotifyIds(JsonUtil.toJsonString(Optional.ofNullable(requestVO.getNotifyIds()).orElse(Sets.newHashSet()))); Assert.isTrue(1 == accessTemplate.getSceneConfigAccess().update(retrySceneConfig, new LambdaUpdateWrapper() .eq(RetrySceneConfig::getNamespaceId, namespaceId)