diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
index 05a2df92..cd95b2d0 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
@@ -17,9 +17,11 @@ import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
 import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
 import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper;
+import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.activiti.service.ProcessNodeService;
+import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.sys.utils.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
@@ -129,30 +131,43 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         CommonVO commonVO = abolishDataVO.getCommon();
         String taskId = commonVO.getTaskId();
         ProcessEsAbolish esAbolish = abolishDataVO.getData();
-        saveOrUpdate(esAbolish);
-        // 先删后增
-        LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
-        if (StrUtil.isBlank(taskId)) {
-            // 第一个节点点击保存没有taskId
+        String projectId = esAbolish.getId();
+        if (StrUtil.isBlank(projectId)) {
+            save(esAbolish);
+        } else {
+            // 先删后增
+            LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
             draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ABOLISH.getValue());
             draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
+            draftWrapper.eq(ProcessDraft::getProjectId, projectId);
             processDraftService.remove(draftWrapper);
+            saveOrUpdate(esAbolish);
+        }
+        String id = esAbolish.getId();
+        if (StrUtil.isBlank(taskId)) {
+            // 第一个节点点击保存没有taskId
             List<ProcessDraft> draftList = new ArrayList<>();
             ProcessDraft draft = new ProcessDraft();
-            draft.setProjectId(esAbolish.getId());
+            draft.setProjectId(id);
             draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue());
+            draft.setPrcName(commonVO.getPrcName());
+            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+            draft.setUserId(CurrentUserUtil.getId()); // 用户id
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         } else {
             String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-            draftWrapper.eq(ProcessDraft::getProjectId, esAbolish.getId());
-            processDraftService.remove(draftWrapper);
             List<ProcessDraft> draftList = new ArrayList<>();
             ProcessDraft draft = new ProcessDraft();
-            draft.setProjectId(esAbolish.getId());
+            draft.setProjectId(id);
             draft.setProcessInstanceId(processInstanceId);
             draft.setPrcName(commonVO.getPrcName());
             draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue());
+            draft.setTaskId(taskId); // 任务id
+            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
+            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
+            draft.setUserId(CurrentUserUtil.getId()); // 用户id
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         }