diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index c652e15f..9addbdd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -134,9 +134,14 @@ public class TaskController { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID",historicTaskInstance.get("id")); List list1 = iBusProcessNewService.list(queryWrapper1); - if(list1.size()>0){ - historicTaskInstance.put("comment",list1.get(0).getCommitFlag()); - historicTaskInstance.put("commentText",list1.get(0).getCommitText()); + if(!list1.isEmpty()){ + if(list1.size() > 1){ + historicTaskInstance.put("comment",list1.get(1).getCommitFlag()); + historicTaskInstance.put("commentText",list1.get(1).getCommitText()); + }else { + historicTaskInstance.put("comment",list1.get(0).getCommitFlag()); + historicTaskInstance.put("commentText",list1.get(0).getCommitText()); + } }else{ historicTaskInstance.put("comment",""); historicTaskInstance.put("commentText","");