From a35df886e2aefb175e60d2f78dbf26ffc06f89de Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 17 Jan 2024 17:40:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080327=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92-=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=90=8E=EF=BC=8C=E7=99=BB=E5=BD=95=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java            | 2 +-
 .../service/impl/ProcessEsAnnualReportServiceImpl.java          | 2 +-
 .../process/esRevision/service/impl/EsRevisionServiceImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 95114e8d..27be26f2 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
@@ -211,10 +211,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
 
     @Override
     public AnnualInitDataVO getHandleData(String taskId) {
-        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         if (!actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("任务不存在");
         }
+        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
         // 根据当前执行Id获取所有子执行Id
         List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);
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 f574d8f5..b247b658 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
@@ -270,11 +270,11 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
 
     @Override
     public AnnualReportDataVO getHandleData(String taskId) {
-        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         // 判断是否是转办的 找到原始任务办理人
         if (!actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("任务不存在");
         }
+        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
         AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
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 5d048c90..2a6b3da4 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
@@ -224,10 +224,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
 
     @Override
     public ESRevisionDataVO getHandleData(String taskId) {
-        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         if (!actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("任务不存在");
         }
+        String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
         // 根据当前执行Id获取所有子执行Id
         List<String> executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId);