1

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

@@ -256,7 +256,9 @@ public class CommonUserController {
                                 }
                                 newWorkflowStep.setCommonStaffs(commonStaffs);
                             }
-                            newWorkflowSteps.add(newWorkflowStep);
+                            if(!"_PLACEHOLDER_".equals(newWorkflowStep.getDesc())){
+                                newWorkflowSteps.add(newWorkflowStep);
+                            }
                         }
                         if (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())
                                 &&workflowSteps.get(i).getBranchExpression().contains(branch)
@@ -299,10 +301,20 @@ public class CommonUserController {
                                 }
                                 newWorkflowStep.setCommonStaffs(commonStaffs);
                             }
-                            newWorkflowSteps.add(newWorkflowStep);
+                            if(!"_PLACEHOLDER_".equals(newWorkflowStep.getDesc())){
+                                newWorkflowSteps.add(newWorkflowStep);
+                            }
                         }
-
-                        if(workflowSteps.get(i).getBranchNodeLocation()!= null &&"END".equals(workflowSteps.get(i).getBranchNodeLocation().name()) && (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())&&!workflowSteps.get(i).getBranchExpression().contains("!="))){
+                        if (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())
+                                &&workflowSteps.get(i).getBranchExpression().contains(branch)
+                                &&workflowSteps.get(i).getBranchNodeLocation()!=null
+                                &&"END".equals(workflowSteps.get(i).getBranchNodeLocation().name())) {
+                            flag = 1;
+                        }
+                        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;
                         }
                     }
@@ -335,7 +347,9 @@ public class CommonUserController {
                         }
                         newWorkflowStep.setCommonStaffs(commonStaffs);
                     }
-                    newWorkflowSteps.add(newWorkflowStep);
+                    if(!"_PLACEHOLDER_".equals(newWorkflowStep.getDesc())){
+                        newWorkflowSteps.add(newWorkflowStep);
+                    }
                 }
 
             }