From f716a25a5f3397b2530ab2167a2e7dc331c15e59 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 3 Feb 2026 17:02:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(autoSkip)=20-=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9F=90=E4=B8=AA=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=98=AF=E9=9C=80=E8=A6=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=88=99=E8=8A=82=E7=82=B9=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87=EF=BC=88=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/EngineExecutionStartListener.java | 11 +++++++++-- .../task/AutoOperatorEvent_101_Listener.java | 18 ++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 1150b6100..5819aaadd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -55,6 +55,7 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.FLOW_SERVER_VERSION import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_LIST_INFO; +import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_LOG_NODE_HAS_BEEN_HIDDEN; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_SIGN; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER; @@ -186,8 +187,14 @@ public class EngineExecutionStartListener implements ExecutionListener { assigners.addAll(approverSelect(specify.getType(), userTask, execution, true)); }); - // 审批候选人为空时的兜底, - emptyAssigneeHandle(assigners, userTask, execution, categoryVersion); + // 部分节点查找人时，如果不存在组织则要求隐藏日志 + Boolean hiddenLog = execution.getVariable(TASK_LOG_NODE_HAS_BEEN_HIDDEN + userTask.getId(), Boolean.class); + + if (!Objects.equals(Boolean.TRUE, hiddenLog)) { + // 审批候选人为空时的兜底, + emptyAssigneeHandle(assigners, userTask, execution, categoryVersion); + } + List resultAssigners = getLimitedElementList(assigners, APPROVAL_ASSIGNER_LIMIT_NUMBER); for (BpmnTaskDelegateAssigner user : resultAssigners) { assigneeIdList.add(user.buildAssigneeId()); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java index a165a4771..9456dff05 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java @@ -37,6 +37,7 @@ import java.util.Optional; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_INFO; +import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_LOG_NODE_HAS_BEEN_HIDDEN; import static cn.axzo.workflow.common.constant.BpmnConstants.WORKFLOW_ENGINE_VERSION; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER; @@ -70,6 +71,14 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener processApproveConf = BpmnMetaParserHelper.getProcessApproveConf(mainProcess); // 开启了电子签名不能自动过审 Boolean activitySignature = BpmnMetaParserHelper.getActivitySignature(mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey())); @@ -83,11 +92,12 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener Date: Wed, 4 Feb 2026 15:07:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(autoSkip)=20-=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/listener/EngineExecutionStartListener.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 5819aaadd..b281fcaea 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -188,10 +188,16 @@ public class EngineExecutionStartListener implements ExecutionListener { }); // 部分节点查找人时，如果不存在组织则要求隐藏日志 - Boolean hiddenLog = execution.getVariable(TASK_LOG_NODE_HAS_BEEN_HIDDEN + userTask.getId(), Boolean.class); - + Boolean hiddenLog = false; + try { + hiddenLog = execution.getVariable(TASK_LOG_NODE_HAS_BEEN_HIDDEN + userTask.getId(), Boolean.class); + log.info("查询是否是组织不存在，需要隐藏日志: {}", hiddenLog); + } catch (Exception e) { + // ignore + } if (!Objects.equals(Boolean.TRUE, hiddenLog)) { // 审批候选人为空时的兜底, + log.info("执行审批人为空的兜底"); emptyAssigneeHandle(assigners, userTask, execution, categoryVersion); } From 5aeec441ca86bd07b111f59d49b4181cfde92a61 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 4 Feb 2026 15:07:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(autoSkip)=20-=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/listener/EngineExecutionStartListener.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 5819aaadd..663d2f9f4 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -188,10 +188,17 @@ public class EngineExecutionStartListener implements ExecutionListener { }); // 部分节点查找人时，如果不存在组织则要求隐藏日志 - Boolean hiddenLog = execution.getVariable(TASK_LOG_NODE_HAS_BEEN_HIDDEN + userTask.getId(), Boolean.class); - + Boolean hiddenLog = false; + try { + hiddenLog = execution.getVariable(TASK_LOG_NODE_HAS_BEEN_HIDDEN + userTask.getId(), Boolean.class); + log.info("查询是否是组织不存在，需要隐藏日志: {}", hiddenLog); + } catch (Exception e) { + // ignore + log.warn("查询组织不存在，需要隐藏日志异常: {}", e.getMessage(), e); + } if (!Objects.equals(Boolean.TRUE, hiddenLog)) { // 审批候选人为空时的兜底, + log.info("执行审批人为空的兜底"); emptyAssigneeHandle(assigners, userTask, execution, categoryVersion); } From 2964ad625b0aa9314819038d3cbd25ffde3501e1 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 4 Feb 2026 15:22:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(autoSkip)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=87=E5=AE=A1=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/task/AutoOperatorEvent_101_Listener.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java index 9456dff05..eeae1118a 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java @@ -94,10 +94,9 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener Date: Fri, 6 Feb 2026 18:02:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(incompact)=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=97=A5=E5=BF=97=E5=92=8C=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/engine/listener/EngineExecutionStartListener.java | 2 +- .../listener/task/AutoOperatorEvent_101_Listener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java index 663d2f9f4..433c7b01a 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java @@ -194,7 +194,7 @@ public class EngineExecutionStartListener implements ExecutionListener { log.info("查询是否是组织不存在，需要隐藏日志: {}", hiddenLog); } catch (Exception e) { // ignore - log.warn("查询组织不存在，需要隐藏日志异常: {}", e.getMessage(), e); + log.warn("查询需要隐藏日志标识异常: {}", e.getMessage(), e); } if (!Objects.equals(Boolean.TRUE, hiddenLog)) { // 审批候选人为空时的兜底, diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java index eeae1118a..5f61d9c70 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java @@ -75,7 +75,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener