From 10e2ad45b6a9a3cb4d69322d45c62217e272dec3 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Sun, 1 Jan 2023 08:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A9=B3=E5=9B=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/flowtask/FlowTaskService.java         | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 2b7ff1ebfe..f243ca30f3 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
@@ -1292,13 +1292,16 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                         .moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState();
             }
             // 最近环节
-            parentUserTaskList.forEach(item -> {
+            for(UserTask item:parentUserTaskList){
                 Map<String, Object> map2 = flowTaskMapper.getTaskByDefKey(task.getProcessInstanceId(), targetIds.get(0));
                 Map<String, Object> map = flowTaskMapper.getHistTaskByID(task.getProcessInstanceId(), targetIds.get(0));
                 String assignee_ =item.getAssignee();
                 if(map.get("ASSIGNEE_")!=null){
                     assignee_ = map.get("ASSIGNEE_").toString();
                 }
+                if(map2==null){
+                   continue;
+                }
                 String id_ = map2.get("id_").toString();
                 ResultBean<List<LatestTaskVo>> listResultBean_2=null;
                 if(flowTaskVo.getUserSid().equals(assignee_)){
@@ -1310,14 +1313,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     taskService.setAssignee(id_, assignee_);
                 }
                 LatestTaskVo latestTaskVo = new LatestTaskVo();
-               latestTaskVo.setASSIGNEE_(item.getAssignee());
-               latestTaskVo.setId_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getId_():id_);
-               latestTaskVo.setName_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getName_():item.getName());
-               latestTaskVo.setTask_def_key_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
-               latestTaskVo.setIncomingSourceRef(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());
+                latestTaskVo.setASSIGNEE_(item.getAssignee());
+                latestTaskVo.setId_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getId_():id_);
+                latestTaskVo.setName_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getName_():item.getName());
+                latestTaskVo.setTask_def_key_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
+                latestTaskVo.setIncomingSourceRef(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());
                 latestTaskVo.setOrgPath(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getOrgPath():orgPath);
-               latestTaskList.add(latestTaskVo);
-            });
+                latestTaskList.add(latestTaskVo);
+            }
+
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {