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 d30b38b0..49089169 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
@@ -181,6 +181,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         String userId = UserUtils.getUserId();
         CommonVO commonVO = abolishData.getCommon();
         String taskId = commonVO.getTaskId();
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
+        }
         Map<String, Object> flowUser = abolishData.getFlowUser();
         // 获取流程实例ID
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -189,9 +192,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
                 .processInstanceId(processInstanceId).singleResult();
         // 获取流程定义ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
-        }
         // 如果是最后一个节点的审批则需要判断是否可以通过
         String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
         if (pass && taskName.equals("标准化审批")) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 060ecb71..95114e8d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -278,7 +278,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         Map<String, Object> flowUser = annualInitData.getFlowUser();
         String taskId = commonVO.getTaskId();
         // 获取task
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 377aa773..f574d8f5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -153,7 +153,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         List<ProcessEsAnnualReport> dataList = annualReportDataVO.getDataList();
         String taskId = commonVO.getTaskId();
         // 获取task
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
         }
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
index 2fc65aae..c3348c63 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
@@ -184,6 +184,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         CommonVO commonVO = archiveDataVO.getCommon();
         Map<String, Object> flowUser = archiveDataVO.getFlowUser();
         String taskId = commonVO.getTaskId();
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
+        }
         // 获取流程实例ID
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         // 获取流程实例对象
@@ -191,9 +194,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
                 .processInstanceId(processInstanceId).singleResult();
         // 获取流程定义ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
-        }
         // 如果是最后一个节点的审批则需要判断是否可以通过
         String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
         if (pass && taskName.equals("标准化审批")) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
index 7661765a..8aebe308 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
@@ -193,13 +193,13 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
     public void approval(ESChangeDataVO changeData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = changeData.getCommon();
-        Map<String, Object> flowUser = changeData.getFlowUser();
         String taskId = commonVO.getTaskId();
-        // 获取流程实例ID
-        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        Map<String, Object> flowUser = changeData.getFlowUser();
+        // 获取流程实例ID
+        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         // 获取流程实例对象
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
                 .processInstanceId(processInstanceId).singleResult();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
index addeb6cf..667021b4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
@@ -180,6 +180,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         String userId = UserUtils.getUserId();
         CommonVO commonVO = enableData.getCommon();
         String taskId = commonVO.getTaskId();
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
+            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
+        }
         Map<String, Object> flowUser = enableData.getFlowUser();
         // 获取流程实例ID
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -188,9 +191,6 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
                 .processInstanceId(processInstanceId).singleResult();
         // 获取流程定义ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
-            throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
-        }
         // 如果是最后一个节点的审批则需要判断是否可以通过
         String taskName = taskService.createTaskQuery().taskId(taskId).singleResult().getName();
         if (pass && taskName.equals("标准化审批")) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index d44d17f6..4655325a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -240,12 +240,12 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = initChangeDataVO.getCommonVO();
-        List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
-        Map<String, Object> flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
         String taskId = commonVO.getTaskId();
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        List<ProcessEsInitChange> initChangeList = initChangeDataVO.getDataList();
+        Map<String, Object> flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index 1925a1c9..afadc949 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -204,12 +204,12 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     public void approval(ESRecheckDataVO recheckData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = recheckData.getCommon();
-        ProcessEsRecheck data = recheckData.getData();
-        Map<String, Object> flowUser = recheckData.getFlowUser();
         String taskId = commonVO.getTaskId();
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        ProcessEsRecheck data = recheckData.getData();
+        Map<String, Object> flowUser = recheckData.getFlowUser();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         if (pass) {
             saveOrUpdate(recheckData.getData());
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index af0bd045..5d048c90 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -310,7 +310,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         CommonVO commonVO = revisionData.getCommon();
         String taskId = commonVO.getTaskId();
         // 获取task
-        if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
+        if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);