From b7b760ddd81d09f15281ecc04704f4e68cf20dad Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 14 Nov 2023 11:33:13 +0800
Subject: [PATCH] =?UTF-8?q?repair=20-=20=E4=BF=9D=E8=AF=81=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/common/utils/BpmTransformUtil.java   | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
index 77c365b3b..48b60cecd 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
@@ -36,7 +36,6 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static cn.axzo.workflow.common.constant.BpmnConstants.AND_SIGN_EXPRESSION;
-import static cn.axzo.workflow.common.constant.BpmnConstants.BPM_ALLOW_SKIP_USER_TASK;
 import static cn.axzo.workflow.common.constant.BpmnConstants.END_EVENT_ID;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_LIST_INFO;
 import static cn.axzo.workflow.common.constant.BpmnConstants.OR_SIGN_EXPRESSION;
@@ -119,16 +118,19 @@ public class BpmTransformUtil {
                             flow.setName(parentNode.getName());
                             if (!ObjectUtils.isEmpty(parentNode.getProperty()) && !Boolean.TRUE.equals(parentNode.getProperty().getDefaultBranch())) {
                                 //解析条件表达式
-                                StringBuffer conditionExpression = new StringBuffer();
-                                conditionExpression.append("${ ")
-                                        .append("var:eq('")
-                                        .append(parentNode.getProperty().getConditionBranchKey())
-                                        .append("', ")
-                                        .append(parentNode.getProperty().getConditionBranchValue())
-                                        .append(")");
-                                conditionExpression.append(" }");
-
-                                flow.setConditionExpression(conditionExpression.toString());
+                                //                                StringBuffer conditionExpression = new StringBuffer();
+                                //                                conditionExpression.append("${ ")
+                                //                                        .append("var:eq('")
+                                //                                        .append(parentNode.getProperty()
+                                //                                        .getConditionBranchKey())
+                                //                                        .append("', ")
+                                //                                        .append(parentNode.getProperty()
+                                //                                        .getConditionBranchValue())
+                                //                                        .append(")");
+                                //                                conditionExpression.append(" }");
+                                //
+                                //                                flow.setConditionExpression(conditionExpression
+                                //                                .toString());
                             }
                         }
                     }
@@ -236,12 +238,13 @@ public class BpmTransformUtil {
                 Map condition = new HashMap();
 
                 //解析条件表达式
-                StringBuffer conditionExpression = new StringBuffer();
-                conditionExpression.append("${ ");
-                conditionExpression.append("var:eq('" + element.getProperty().getConditionBranchKey() + "', " + element.getProperty().getConditionBranchValue() + ") ");
-                conditionExpression.append(" }");
-                condition.put("nodeName", nodeName);
-                condition.put("expression", conditionExpression.toString());
+                //                StringBuffer conditionExpression = new StringBuffer();
+                //                conditionExpression.append("${ ");
+                //                conditionExpression.append("var:eq('" + element.getProperty().getConditionBranchKey
+                //                () + "', " + element.getProperty().getConditionBranchValue() + ") ");
+                //                conditionExpression.append(" }");
+                //                condition.put("nodeName", nodeName);
+                //                condition.put("expression", conditionExpression.toString());
 
                 conditions.add(condition);
                 continue;
@@ -393,9 +396,10 @@ public class BpmTransformUtil {
                     }
                 }
                 // 设置审批人为空时,允许自动通过
-                if (!ObjectUtils.isEmpty(flowNode.getProperty()) && flowNode.getProperty().getAllowSkip()) {
-                    userTask.setSkipExpression("${" + BPM_ALLOW_SKIP_USER_TASK + "}");
-                }
+                //                if (!ObjectUtils.isEmpty(flowNode.getProperty()) && flowNode.getProperty()
+                //                .getAllowSkip()) {
+                //                    userTask.setSkipExpression("${" + BPM_ALLOW_SKIP_USER_TASK + "}");
+                //                }
                 if (!ObjectUtils.isEmpty(flowNode.getProperty()) && StringUtils.isNotBlank(flowNode.getProperty().getFormKey())) {
                     userTask.setFormKey(flowNode.getProperty().getFormKey());
                 }