wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair - 保证编译通过

Browse Source
This commit is contained in:
wangli 2023-11-14 11:33:13 +08:00
parent 5d07e9eff0
commit b7b760ddd8
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
View File

@ -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());
}