From 3787863227056ba7f645317a0ddee0ec778b4b1e Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 12 Dec 2023 20:03:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=9B=B4=E6=96=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E6=A8=A1=E6=9D=BF=E5=8F=96=E6=B6=88=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/common/model/request/bpmn/BpmnNoticeConf.java    | 4 ++--
 .../common/model/request/bpmn/BpmnNoticeProperty.java         | 3 +--
 .../common/model/request/bpmn/BpmnPendingProperty.java        | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeConf.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeConf.java
index 4ffaf042f..e152476ce 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeConf.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeConf.java
@@ -25,14 +25,14 @@ public class BpmnNoticeConf implements Serializable {
      * 通知的配置
      */
     @Valid
-    @NotNull(message = "消息模板不能为空")
+    //    @NotNull(message = "消息模板不能为空")
     private BpmnNoticeProperty notice;
 
     /**
      * 待办的配置
      */
     @Valid
-    //    @NotNull(message = "待办模板不能为空")
+    @NotNull(message = "待办模板不能为空")
     private BpmnPendingProperty pending;
 
     /**
diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeProperty.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeProperty.java
index 52921d7af..2e6b89ba1 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeProperty.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnNoticeProperty.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -25,7 +24,7 @@ public class BpmnNoticeProperty implements Serializable {
      * 通知消息模板 ID
      */
     @ApiModelProperty(value = "通知消息模板 ID")
-    @NotBlank(message = "通知消息模板 ID 不能为空")
+    //    @NotBlank(message = "通知消息模板 ID 不能为空")
     private String noticeMessageId;
 
     /**
diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnPendingProperty.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnPendingProperty.java
index 21118ec0f..d9b1dbdbc 100644
--- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnPendingProperty.java
+++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnPendingProperty.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 待办
  *
@@ -21,7 +23,7 @@ public class BpmnPendingProperty {
      * 待办消息模板 ID
      */
     @ApiModelProperty(value = "待办消息模板 ID")
-    //    @NotBlank(message = "待办消息模板 ID 不能为空")
+    @NotBlank(message = "待办消息模板 ID 不能为空")
     private String pendingMessageId;
 
     /**