Browse Source

!73 工作流程发起以及审批异常,NotEmpty校验Long类型异常
Merge pull request !73 from zhuqi7/master

芋道源码 3 years ago
parent
commit
cd42846bec

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java

@@ -21,7 +21,7 @@ public class BpmMessageSendWhenTaskCreatedReqDTO {
      */
     @NotEmpty(message = "流程实例的名字不能为空")
     private String processInstanceName;
-    @NotEmpty(message = "发起人的用户编号")
+    @NotNull(message = "发起人的用户编号")
     private Long startUserId;
     @NotEmpty(message = "发起人的昵称")
     private String startUserNickname;

+ 3 - 1
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java

@@ -73,7 +73,8 @@ public interface BpmTaskConvert {
     @Mappings({
             @Mapping(source = "id", target = "taskId"),
             @Mapping(source = "assignee", target = "assigneeUserId"),
-            @Mapping(source = "createdDate", target = "createTime")
+            @Mapping(source = "createdDate", target = "createTime"),
+            @Mapping(target = "id", ignore = true)
     })
     BpmTaskExtDO convert(org.activiti.api.task.model.Task bean);
 
@@ -104,6 +105,7 @@ public interface BpmTaskConvert {
     BpmTaskRespVO convert3(HistoricTaskInstance bean);
     BpmTaskRespVO.User convert3(AdminUserRespDTO bean);
 
+    @Mapping(target = "id", ignore = true)
     void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to);
 
     @Mappings({

+ 3 - 2
yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 @ApiModel("用户 APP - 退款订单 Req VO")
 @Data
@@ -15,11 +16,11 @@ import javax.validation.constraints.NotEmpty;
 public class AppPayRefundReqVO {
 
     @ApiModelProperty(value = "支付订单编号自增", required = true, example = "10")
-    @NotEmpty(message = "支付订单编号自增")
+    @NotNull(message = "支付订单编号自增")
     private Long payOrderId;
 
     @ApiModelProperty(value = "退款金额", required = true, example = "1")
-    @NotEmpty(message = "退款金额")
+    @NotNull(message = "退款金额")
     private Long amount;
 
     @ApiModelProperty(value = "退款原因", required = true, example = "不喜欢")