1

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

@@ -184,9 +184,6 @@ public class CommonUserController {
      */
     @GetMapping("/getHis")
     public List<NewWorkflowStep> getHis(String businessKey, String workflowId, String branch) throws ServiceException {
-        if(!"洮南市二龙乡瀚城农产品有限公司".equals(branch)){
-            branch = "zt";
-        }
         List<WorkflowHistoricTask> workflowHistoricTasks = workflowHistoryService.getInstanceHistories(businessKey);
         if(!CollectionUtils.isEmpty(workflowHistoricTasks)){
             List<WorkflowHistoricTask> workflowHistoricTasks1 = new ArrayList<>(workflowHistoricTasks);
@@ -270,7 +267,7 @@ public class CommonUserController {
 
                     }
                     if ("zt".equals(branch)) {
-                        if (workflowSteps.get(i).getBranchNodeLocation()!= null &&"BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())) {
+                        if (workflowSteps.get(i).getBranchNodeLocation()!= null &&"BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())&&!workflowSteps.get(i).getBranchExpression().contains("!="))) {
                             biaoshi = 1;
                         }
                         if(biaoshi ==1){
@@ -305,7 +302,7 @@ public class CommonUserController {
                             newWorkflowSteps.add(newWorkflowStep);
                         }
 
-                        if(workflowSteps.get(i).getBranchNodeLocation()!= null &&"END".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())){
+                        if(workflowSteps.get(i).getBranchNodeLocation()!= null &&"END".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())&&!workflowSteps.get(i).getBranchExpression().contains("!="))){
                             biaoshi = 0;
                         }
                     }