BJ_ZTEITS-Developers / parking-cloud-yudao

Commit cd42846bec9a4f88728540b06873621f83502e84

Authored by 芋道源码
Committed by Gitee
2 parents 51511129 f0395c45

!73 工作流程发起以及审批异常，NotEmpty校验Long类型异常 

Merge pull request !73 from zhuqi7/master
Inline Side-by-side
Showing 3 changed files with 7 additions and 4 deletions
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java
  View file @cd42846
@@ -21,7 +21,7 @@ public class BpmMessageSendWhenTaskCreatedReqDTO { @@ -21,7 +21,7 @@ public class BpmMessageSendWhenTaskCreatedReqDTO {
21 */ 21 */
22 @NotEmpty(message = "流程实例的名字不能为空") 22 @NotEmpty(message = "流程实例的名字不能为空")
23 private String processInstanceName; 23 private String processInstanceName;
24 - @NotEmpty(message = "发起人的用户编号") 24 + @NotNull(message = "发起人的用户编号")
25 private Long startUserId; 25 private Long startUserId;
26 @NotEmpty(message = "发起人的昵称") 26 @NotEmpty(message = "发起人的昵称")
27 private String startUserNickname; 27 private String startUserNickname;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
  View file @cd42846
@@ -73,7 +73,8 @@ public interface BpmTaskConvert { @@ -73,7 +73,8 @@ public interface BpmTaskConvert {
73 @Mappings({ 73 @Mappings({
74 @Mapping(source = "id", target = "taskId"), 74 @Mapping(source = "id", target = "taskId"),
75 @Mapping(source = "assignee", target = "assigneeUserId"), 75 @Mapping(source = "assignee", target = "assigneeUserId"),
76 - @Mapping(source = "createdDate", target = "createTime") 76 + @Mapping(source = "createdDate", target = "createTime"),
  77 + @Mapping(target = "id", ignore = true)
77 }) 78 })
78 BpmTaskExtDO convert(org.activiti.api.task.model.Task bean); 79 BpmTaskExtDO convert(org.activiti.api.task.model.Task bean);
79 80
@@ -104,6 +105,7 @@ public interface BpmTaskConvert { @@ -104,6 +105,7 @@ public interface BpmTaskConvert {
104 BpmTaskRespVO convert3(HistoricTaskInstance bean); 105 BpmTaskRespVO convert3(HistoricTaskInstance bean);
105 BpmTaskRespVO.User convert3(AdminUserRespDTO bean); 106 BpmTaskRespVO.User convert3(AdminUserRespDTO bean);
106 107
  108 + @Mapping(target = "id", ignore = true)
107 void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to); 109 void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to);
108 110
109 @Mappings({ 111 @Mappings({
yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java
  View file @cd42846
@@ -7,6 +7,7 @@ import lombok.Data; @@ -7,6 +7,7 @@ import lombok.Data;
7 import lombok.NoArgsConstructor; 7 import lombok.NoArgsConstructor;
8 8
9 import javax.validation.constraints.NotEmpty; 9 import javax.validation.constraints.NotEmpty;
  10 +import javax.validation.constraints.NotNull;
10 11
11 @ApiModel("用户 APP - 退款订单 Req VO") 12 @ApiModel("用户 APP - 退款订单 Req VO")
12 @Data 13 @Data
@@ -15,11 +16,11 @@ import javax.validation.constraints.NotEmpty; @@ -15,11 +16,11 @@ import javax.validation.constraints.NotEmpty;
15 public class AppPayRefundReqVO { 16 public class AppPayRefundReqVO {
16 17
17 @ApiModelProperty(value = "支付订单编号自增", required = true, example = "10") 18 @ApiModelProperty(value = "支付订单编号自增", required = true, example = "10")
18 - @NotEmpty(message = "支付订单编号自增") 19 + @NotNull(message = "支付订单编号自增")
19 private Long payOrderId; 20 private Long payOrderId;
20 21
21 @ApiModelProperty(value = "退款金额", required = true, example = "1") 22 @ApiModelProperty(value = "退款金额", required = true, example = "1")
22 - @NotEmpty(message = "退款金额") 23 + @NotNull(message = "退款金额")
23 private Long amount; 24 private Long amount;
24 25
25 @ApiModelProperty(value = "退款原因", required = true, example = "不喜欢") 26 @ApiModelProperty(value = "退款原因", required = true, example = "不喜欢")