From 3129a609e88dba43d59dab51dcd5b309a7763893 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Sat, 3 Sep 2022 14:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=92=A4=E5=9B=9E=E3=80=81?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/flowtask/FlowTaskService.java         | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 4a1331c39d..9a5b4ca810 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -1353,12 +1353,20 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         if(list.size()==0){
             return "";
         }
-        SequenceFlow sequenceFlow = list.get(0);
 
-// 获取上一个节点的activityId
-        String sourceRef = sequenceFlow.getSourceRef();
-        HistoricActivityInstance historicActivityInstance = historyService.createHistoricActivityInstanceQuery().activityId(sourceRef)
-                .processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().desc().list().get(0);//singleResult();
+        List<HistoricActivityInstance> list1=new ArrayList<>();
+        for( SequenceFlow sequenceFlow:list){
+            String sourceRef = sequenceFlow.getSourceRef();
+            list1= historyService.createHistoricActivityInstanceQuery().activityId(sourceRef)
+                    .processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().desc().list();
+            if(list1.size()>0){
+                break;
+            }
+        }
+        // 获取上一个节点的activityId
+
+
+        HistoricActivityInstance historicActivityInstance = list1.get(0);//singleResult()
         String activityType = historicActivityInstance.getActivityType();
         String historicActivityInstanceActivityId = historicActivityInstance.getActivityId();
         if (!"userTask".equals(activityType)) {
@@ -1593,11 +1601,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                /* if(assignee.equals("0d8d8119-d476-47ce-89c2-075cd809dda6")){
                     taskService.setAssignee(task_map.get("id_").toString(), assignee);
                 }else{*/
+                if(task_map!=null){
                     taskService.setAssignee(task_map.get("id_").toString(), assignee);
+                    latestTaskVo.setId_(task_map.get("id_").toString());
+                    latestTaskList.add(latestTaskVo);
+                }
+
                /* }*/
 
-                latestTaskVo.setId_(task_map.get("id_").toString());
-                latestTaskList.add(latestTaskVo);
+
             });
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");