From 37ec560687ea684691a2ab1add66ee127ee7f10d Mon Sep 17 00:00:00 2001 From: zhuqi Date: Wed, 9 Feb 2022 08:53:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=BF=BD=E7=95=A5id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java index a8f499e1b..d74cc16b8 100644 --- a/yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java +++ b/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({ From f0395c450f5dae7a1f2588af6faada56d57705f1 Mon Sep 17 00:00:00 2001 From: zhuqi Date: Wed, 9 Feb 2022 08:57:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=A1=E9=AA=8CLong=E7=B1=BB=E5=9E=8BNot?= =?UTF-8?q?Empty=E6=94=B9=E4=B8=BANotNull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java | 2 +- .../pay/controller/app/refund/vo/AppPayRefundReqVO.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java b/yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java index bf9528f66..7cb0e3d70 100644 --- a/yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java +++ b/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; diff --git a/yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java b/yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java index c810f3829..627874561 100644 --- a/yudao-module-pay/yudao-module-pay-impl/src/main/java/cn/iocoder/yudao/module/pay/controller/app/refund/vo/AppPayRefundReqVO.java +++ b/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 = "不喜欢")