BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 56d280fd3fa0c18ed8cbf889e0ab8405e656a0f1

Authored by jason
1 parent 9449f996

【代码修复】 修复条件节点的预测问题

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @56d280f
... ... @@ -641,7 +641,7 @@ public class SimpleModelUtils {
641 641 if (nodeType == BpmSimpleModelNodeType.CONDITION_BRANCH_NODE) {
642 642 // 查找满足条件的 BpmSimpleModelNodeVO 节点
643 643 BpmSimpleModelNodeVO matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(),
644   - conditionNode -> BooleanUtil.isFalse(currentNode.getDefaultFlow())
  644 + conditionNode -> !BooleanUtil.isTrue(conditionNode.getDefaultFlow())
645 645 && evalConditionExpress(variables, conditionNode));
646 646 if (matchConditionNode == null) {
647 647 matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(),
... ... @@ -656,7 +656,7 @@ public class SimpleModelUtils {
656 656 if (nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE) {
657 657 // 查找满足条件的 BpmSimpleModelNodeVO 节点
658 658 Collection<BpmSimpleModelNodeVO> matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(),
659   - conditionNode -> BooleanUtil.isFalse(currentNode.getDefaultFlow())
  659 + conditionNode -> !BooleanUtil.isTrue(conditionNode.getDefaultFlow())
660 660 && evalConditionExpress(variables, conditionNode));
661 661 if (CollUtil.isEmpty(matchConditionNodes)) {
662 662 matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(),
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
  View file @56d280f
... ... @@ -141,7 +141,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
141 141 // 2.1 查询我的首个任务
142 142 Task todoTask = CollUtil.findOne(tasks, task -> {
143 143 return isAssignUserTask(userId, task) // 当前用户为审批人
144   - || isAddSignUserTask(userId, task); // 当前用户为价钱人（为了减签）
  144 + || isAddSignUserTask(userId, task); // 当前用户为加签人（为了减签）
145 145 });
146 146 if (todoTask == null) {
147 147 return null;
... ...