完善驳回功能

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_)){
@@ -1317,7 +1320,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 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);
-            });
+            }
+
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {