From 9b1b4a4a229ca607cbab1f7b97400172cd01214e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 4 Feb 2024 10:05:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080183=20=E6=B3=95=E8=A7=84=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=B5=81=E7=A8=8B--=E5=8F=91=E8=B5=B7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=8F=91=E8=B5=B7=E5=90=8E=E8=A2=AB=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?--=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E5=92=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=BA=BA=E5=91=98--=E7=82=B9=E5=87=BB=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98--=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/common/service/ActFlowCommonService.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index 73400547..30506b3f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -372,7 +372,12 @@ public class ActFlowCommonService {
         draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
         draftWrapper.eq(ProcessDraft::getUserId, userId);
         draftWrapper.eq(ProcessDraft::getTaskId, taskId);
-        return processDraftService.getOne(draftWrapper);
+        draftWrapper.orderByDesc(ProcessDraft::getCreateTime);
+        List<ProcessDraft> list = processDraftService.list(draftWrapper);
+        if (list != null && !list.isEmpty()) {
+            return list.get(0);
+        }
+        return null;
     }
 
     public void getExistDraftAndRemove(CommonVO common, ProcessTypeEnum processTypeEnum) {