diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java
index b2eeb129..b7a964fe 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java
@@ -193,7 +193,8 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
         EsDeclareFlowVO esDeclareFlowVO = new EsDeclareFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
index 14597073..55ea8fb7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
@@ -281,7 +281,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
         EsInspectFlowVO esInspectFlowVO = new EsInspectFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
index d292de6e..71196ba1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
@@ -193,7 +193,8 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
         EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO = new EsInspectDelayApplyFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
index e5485ccc..3f290c6e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
@@ -237,7 +237,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
         EsInspectPlanFlowVO esInspectPlanFlowVO = new EsInspectPlanFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
index 32a85d3f..037b44d4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
@@ -153,7 +153,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
         EsInspectRectifyFlowVO esInspectReportFlowVO = new EsInspectRectifyFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
index 7efcf754..98d699dd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
@@ -162,7 +162,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
         EsPermissionApplyFlowVO esPermissionApplyFlowVO = new EsPermissionApplyFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
index 98708aaa..6ddd39a5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
@@ -463,7 +463,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         if (StringUtils.isNotBlank(taskId)) {
             deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
         }
-        deleteWrapper.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE);
+        deleteWrapper.and(qw ->
+                qw.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE)
+                        .or().isNull(ProcessDraft::getSaveSource));
         List<ProcessDraft> processDraftList = processDraftService.list(deleteWrapper);
         for (ProcessDraft processDraft : processDraftList) {
             processDraftService.removeById(processDraft.getId());
@@ -548,7 +550,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         } else {
             // 流程信息
             ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                    .eq(ProcessAll::getProjectId, projectId));
+                    .eq(ProcessAll::getProjectId, projectId)
+                    .orderByDesc(ProcessAll::getCreateTime), false);
             if (!Objects.isNull(processAll)) {
                 basicProcessInfoDTO.setProcessInstanceId(processAll.getProcessInstanceId());
                 basicProcessInfoDTO.setProcessType(processAll.getPrcType());
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
index 0dc962bf..7a109f93 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
@@ -182,7 +182,8 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
         MeetingManageFlowVO meetingManageFlowVO = new MeetingManageFlowVO();
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
-                .eq(ProcessAll::getProjectId, projectId), false);
+                .eq(ProcessAll::getProjectId, projectId)
+                .orderByDesc(ProcessAll::getCreateTime), false);
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
 
         // 是否存在草稿