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

update - 调整 condition 节点拼接条件组,条件的表达式

Browse Source
This commit is contained in:
wangli 2023-12-08 12:27:32 +08:00
parent ebcb76fd9b
commit 43fedb8814
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java
View File

@ -59,10 +59,10 @@ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter<Sequenc
StringBuilder sb = new StringBuilder("${");
groups.forEach(group -> {
String operator = "||";
if ("and".equals(nodeProperty.getGroupsType())) {
if ("and".equalsIgnoreCase(nodeProperty.getGroupsType())) {
operator = "&&";
}
if (sb.indexOf(operator) > 0) {
if (sb.indexOf(operator) > 0 || sb.length() != 2) {
sb.append(" ").append(operator).append(" ");
}
StringBuilder conditionSb = new StringBuilder();
@ -70,10 +70,10 @@ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter<Sequenc
conditionSb.append("(");
group.getConditions().forEach(condition -> {
String conditionOperator = "||";
if ("and".equals(group.getConditionsType())) {
if ("and".equalsIgnoreCase(group.getConditionsType())) {
conditionOperator = "&&";
}
if (conditionSb.indexOf(conditionOperator) > 0) {
if (conditionSb.indexOf(conditionOperator) > 0 || conditionSb.length() != 1) {
conditionSb.append(" ").append(conditionOperator).append(" ");
}
conditionSb.append(parseConditions(condition));