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 76e88ca7..871d2683 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
@@ -354,6 +354,15 @@ public class ActFlowCommonService {
         return processDraftService.getOne(draftWrapper);
     }
 
+    public ProcessDraft getExistDraftByTaskId(String taskId, ProcessTypeEnum processTypeEnum) {
+        String userId = UserUtils.getUserId();
+        LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
+        draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
+        draftWrapper.eq(ProcessDraft::getUserId, userId);
+        draftWrapper.eq(ProcessDraft::getTaskId, taskId);
+        return processDraftService.getOne(draftWrapper);
+    }
+
     public void getExistDraftAndRemove(CommonVO common, ProcessTypeEnum processTypeEnum) {
         String taskId = common.getTaskId();
         String userId = UserUtils.getUserId();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
index 703bcb15..a4ddd178 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
@@ -88,6 +89,10 @@ public class ESAbolishController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ABOLISH);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(abolishService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
index cf813cf5..04e6bd81 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java
@@ -7,6 +7,7 @@ import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
@@ -96,6 +97,10 @@ public class ESAnnualInitController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ANNUAL_INIT);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(annualInitService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
index 76697e27..254f9de4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
@@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
@@ -133,6 +134,10 @@ public class ESAnnualReportController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable(value = "taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ANNUAL_REPORT);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(annualReportService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
index d35d4d03..c0043c25 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -73,6 +74,10 @@ public class ESArchiveController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ARCHIVE);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(archiveService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java
index 66c8f9ee..4704be35 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -74,6 +75,10 @@ public class ESChangeController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_CHANGE);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(changeService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java
index 1cf5a892..015f0d06 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -86,6 +87,10 @@ public class ESEnableController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_ENABLE);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(enableService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
index e5356a15..544222ef 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
@@ -102,6 +103,10 @@ public class ProcessESInitChangeController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_INIT_CHANGE);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(initChangeService.getHandleData(taskId));
     }
 
@@ -115,7 +120,7 @@ public class ProcessESInitChangeController {
     @GetMapping("/draftHandle")
     @Translation
     public Result<?> draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) {
-        return Result.OK(actFlowCommonService.getExistDraft(draftId,  ProcessTypeEnum.ES_INIT_CHANGE));
+        return Result.OK(actFlowCommonService.getExistDraft(draftId, ProcessTypeEnum.ES_INIT_CHANGE));
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
index 21be113b..14ac9265 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java
@@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
@@ -80,6 +81,10 @@ public class ESRecheckController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_RECHECK);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(recheckService.getHandleData(taskId));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
index 958e32e4..fd4d3528 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/controller/ESRevisionController.java
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
@@ -73,6 +74,10 @@ public class ESRevisionController {
     @GetMapping("/handle/{taskId}")
     @Translation
     public Result<?> handle(@PathVariable("taskId") String taskId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.ES_REVISION);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         return Result.OK(revisionService.getHandleData(taskId));
     }