1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -34,6 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -80,12 +82,21 @@ public class CommonUserController {
         List<WorkflowHistoricTask> workflowHistoricTasks = workflowHistoryService.getInstanceHistories(businessKey);
         Workflow workflow = workflowService.getWorkflowDetail(workflowId);
         if (CollectionUtil.isNotEmpty(workflowHistoricTasks) && workflow != null) {
+            Collections.reverse(workflowHistoricTasks);
+//            List<WorkflowHistoricTask> workflowHistoricTaskList = new ArrayList<>();
+//            int p = workflowHistoricTasks.size() - 1;
+//            for (int i = 0; i < workflowHistoricTasks.size(); i++) {
+//                workflowHistoricTaskList.add(workflowHistoricTasks.get(p));
+//                p = p - 1;
+//            }
+//            workflowHistoricTasks = new ArrayList<>();
+//            workflowHistoricTasks = workflowHistoricTaskList;
             List<WorkflowStep> workflowSteps = workflow.getSteps();
             WorkflowHistoricTask workflowHistoricTask = workflowHistoricTasks.get(workflowHistoricTasks.size() - 1);
             int a = 0;
             for (int i = 0; i < workflowSteps.size(); i++) {
                 if ((workflowSteps.get(i).getAuditRoles().equals(AuthSecurityUtils.getStaffById(workflowHistoricTask.getOperatorId()).getMajorRoleId()))
-                        || (workflowSteps.get(i).getAuditUsers().equals(workflowHistoricTask.getOperatorId()))) {
+                        || (!StringUtils.isEmpty(workflowSteps.get(i).getAuditUsers()) && workflowSteps.get(i).getAuditUsers().equals(workflowHistoricTask.getOperatorId()))) {
                     break;
                 } else {
                     a = a + 1;
@@ -95,7 +106,7 @@ public class CommonUserController {
 
             }
             if (a < workflowSteps.size()) {
-                for (int i = a+1; i < workflowSteps.size(); i++) {
+                for (int i = a + 1; i < workflowSteps.size(); i++) {
                     WorkflowHistoricTask workflowHistoricTask1 = new WorkflowHistoricTask();
                     workflowHistoricTask1.setOperatorMajorRoleName(workflowSteps.get(i).getDesc());
                     workflowHistoricTasks.add(workflowHistoricTask1);
@@ -103,8 +114,7 @@ public class CommonUserController {
 
             }
 
-        }
-        else{
+        } else {
             List<WorkflowStep> workflowSteps = workflow.getSteps();
             for (int i = 0; i < workflowSteps.size(); i++) {
                 WorkflowHistoricTask workflowHistoricTask1 = new WorkflowHistoricTask();