1

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

@@ -223,11 +223,17 @@ public class CommonUserController {
             int biaoshi = 0;
             for (int i = 0; i < workflowSteps.size(); i++) {
                 if (!StringUtils.isEmpty(branch)) {
-                    if (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())&&workflowSteps.get(i).getBranchExpression().contains(branch)) {
-                        if (flag == 0) {
-
-                            workflowSteps.get(i + 1).setBranchExpression(workflowSteps.get(i).getBranchExpression());
-
+                    if ("zt".equals(branch)) {
+                        if(i == 0 && workflow.getBusinessCode().equals("FEIYONGGUANLI-APPROVE")){
+                            i= 4;
+                        }
+                        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){
                             NewWorkflowStep newWorkflowStep = new NewWorkflowStep();
                             BeanUtils.copyProperties(workflowSteps.get(i), newWorkflowStep);
                             if ("ALL".equals(String.valueOf(workflowSteps.get(i).getCountersignType()))) {
@@ -260,22 +266,19 @@ public class CommonUserController {
                                 newWorkflowSteps.add(newWorkflowStep);
                             }
                         }
-                        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 ("zt".equals(branch)) {
-                        if (workflowSteps.get(i).getBranchNodeLocation()!= null
-                                &&"BEGIN".equals(workflowSteps.get(i).getBranchNodeLocation().name())
+                        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 = 1;
+                                &&workflowSteps.get(i).getBranchExpression().contains("!=")){
+
+                            biaoshi = 0;
                         }
-                        if(biaoshi ==1){
+                    }
+                    if (!StringUtils.isEmpty(workflowSteps.get(i).getBranchExpression())&&workflowSteps.get(i).getBranchExpression().contains(branch)) {
+                        if (flag == 0) {
+
+                            workflowSteps.get(i + 1).setBranchExpression(workflowSteps.get(i).getBranchExpression());
+
                             NewWorkflowStep newWorkflowStep = new NewWorkflowStep();
                             BeanUtils.copyProperties(workflowSteps.get(i), newWorkflowStep);
                             if ("ALL".equals(String.valueOf(workflowSteps.get(i).getCountersignType()))) {
@@ -308,14 +311,15 @@ 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())
-                                &&workflowSteps.get(i).getBranchExpression().contains("!=")){
-
-                            biaoshi = 0;
+                        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;
                         }
+
                     }
+
                 } else {
                     NewWorkflowStep newWorkflowStep = new NewWorkflowStep();
                     BeanUtils.copyProperties(workflowSteps.get(i), newWorkflowStep);