From ab164d93f080f766b429ad5c9451bae9e0c1b787 Mon Sep 17 00:00:00 2001
From: zy <317328629@qq.com>
Date: Mon, 21 Nov 2022 10:15:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=B5=81=E7=A8=8B=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E6=9C=9F=E6=97=B6=E5=8C=BA=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
index a4ba5cc85..fb3064e22 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
@@ -77,6 +77,7 @@ public interface BpmTaskConvert {
     }
 
     @Mapping(source = "suspended", target = "suspensionState", qualifiedByName = "convertSuspendedToSuspensionState")
+    @Mapping(target = "createTime", expression = "java(LocalDateTime.ofInstant(bean.getCreateTime().toInstant(),ZoneId.systemDefault()))")
     BpmTaskTodoPageItemRespVO convert1(Task bean);
 
     @Named("convertSuspendedToSuspensionState")

From 65ba4b6ae097b4e12d2d168e0b54ca7185dc082e Mon Sep 17 00:00:00 2001
From: zy <317328629@qq.com>
Date: Mon, 21 Nov 2022 13:34:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:claimTime=20=E8=BD=AC=E6=8D=A2=E6=97=B6?=
 =?UTF-8?q?=E4=B9=9F=E5=8A=A0=E6=97=B6=E5=8C=BA=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E8=BF=9B=E8=A1=8C=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
index fb3064e22..578d11b03 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
@@ -77,7 +77,8 @@ public interface BpmTaskConvert {
     }
 
     @Mapping(source = "suspended", target = "suspensionState", qualifiedByName = "convertSuspendedToSuspensionState")
-    @Mapping(target = "createTime", expression = "java(LocalDateTime.ofInstant(bean.getCreateTime().toInstant(),ZoneId.systemDefault()))")
+    @Mapping(target = "claimTime", expression = "java(bean.getClaimTime()==null?null: LocalDateTime.ofInstant(bean.getClaimTime().toInstant(),ZoneId.systemDefault()))")
+    @Mapping(target = "createTime", expression = "java(bean.getCreateTime()==null?null:LocalDateTime.ofInstant(bean.getCreateTime().toInstant(),ZoneId.systemDefault()))")
     BpmTaskTodoPageItemRespVO convert1(Task bean);
 
     @Named("convertSuspendedToSuspensionState")