hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-01 02:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jason
2024-11-01 22:38:47 +08:00
parent 9449f99637
commit 56d280fd3f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
View File

@@ -641,7 +641,7 @@ public class SimpleModelUtils {
if (nodeType == BpmSimpleModelNodeType.CONDITION_BRANCH_NODE) { if (nodeType == BpmSimpleModelNodeType.CONDITION_BRANCH_NODE) {
// 查找满足条件的 BpmSimpleModelNodeVO 节点 // 查找满足条件的 BpmSimpleModelNodeVO 节点
BpmSimpleModelNodeVO matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(), BpmSimpleModelNodeVO matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(),
conditionNode -> BooleanUtil.isFalse(currentNode.getDefaultFlow()) conditionNode -> !BooleanUtil.isTrue(conditionNode.getDefaultFlow())
&& evalConditionExpress(variables, conditionNode)); && evalConditionExpress(variables, conditionNode));
if (matchConditionNode == null) { if (matchConditionNode == null) {
matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(), matchConditionNode = CollUtil.findOne(currentNode.getConditionNodes(),
@@ -656,7 +656,7 @@ public class SimpleModelUtils {
if (nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE) { if (nodeType == BpmSimpleModelNodeType.INCLUSIVE_BRANCH_NODE) {
// 查找满足条件的 BpmSimpleModelNodeVO 节点 // 查找满足条件的 BpmSimpleModelNodeVO 节点
Collection<BpmSimpleModelNodeVO> matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(), Collection<BpmSimpleModelNodeVO> matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(),
conditionNode -> BooleanUtil.isFalse(currentNode.getDefaultFlow()) conditionNode -> !BooleanUtil.isTrue(conditionNode.getDefaultFlow())
&& evalConditionExpress(variables, conditionNode)); && evalConditionExpress(variables, conditionNode));
if (CollUtil.isEmpty(matchConditionNodes)) { if (CollUtil.isEmpty(matchConditionNodes)) {
matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(), matchConditionNodes = CollUtil.filterNew(currentNode.getConditionNodes(),

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
View File

@@ -141,7 +141,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
// 2.1 查询我的首个任务 // 2.1 查询我的首个任务
Task todoTask = CollUtil.findOne(tasks, task -> { Task todoTask = CollUtil.findOne(tasks, task -> {
return isAssignUserTask(userId, task) // 当前用户为审批人 return isAssignUserTask(userId, task) // 当前用户为审批人
|| isAddSignUserTask(userId, task); // 当前用户为价钱人（为了减签） || isAddSignUserTask(userId, task); // 当前用户为加签人（为了减签）
}); });
if (todoTask == null) { if (todoTask == null) {
return null; return null;