Merge pull request #94 from codingapi/dev

xlorne · web-flow · commit 8226a12218be · 2026-03-18T10:18:24.000+08:00
fix createdOperator bug
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java b/flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java
@@ -600,13 +600,17 @@ public boolean isForward() {
     public FlowSession createFlowSession(IRepositoryHolder repositoryHolder,
                                          Workflow workflow,
                                          IFlowOperator currentOperator,
+                                         IFlowOperator createdOperator,
+                                         IFlowOperator submitOperator,
                                          FormData formData,
                                          FlowAdvice advice) {
         List<FlowRecord> currentRecords = repositoryHolder.findCurrentNodeRecords(this.getFromId(), this.getNodeId());
         IFlowNode currentNode = workflow.getFlowNode(nodeId);
         return new FlowSession(
                 repositoryHolder,
                 currentOperator,
+                createdOperator,
+                submitOperator,
                 workflow,
                 currentNode,
                 advice.getAction(),
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java b/flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java
@@ -65,7 +65,7 @@ public class GroovyScriptRequest {
      * 流程提交Id
      */
     @Getter
-    private long submitOperatorId;
+    private IFlowOperator submitOperator;
 
     /**
      * 流程提交人姓名
@@ -87,14 +87,21 @@ public GroovyScriptRequest(FlowSession session) {
             this.currentOperator = session.getCurrentOperator();
         }
 
+        // 提取创建人信息
+        if (session.getCreatedOperator() != null) {
+            this.createdOperator = session.getCreatedOperator();
+        }
+
+        // 提取提交人信息
+        if (session.getSubmitOperator() != null) {
+            this.submitOperator = session.getSubmitOperator();
+        }
+
         // 提取流程信息
         if (session.getWorkflow() != null) {
             this.workflowTitle = session.getWorkflow().getTitle();
             this.workflowCode = session.getWorkflow().getCode();
-            // 提取创建人信息
-            if (session.getWorkflow().getCreatedOperator() != null) {
-                this.createdOperator = session.getWorkflow().getCreatedOperator();
-            }
+
         }
 
         // 提取节点信息
@@ -103,12 +110,6 @@ public GroovyScriptRequest(FlowSession session) {
             this.nodeType = session.getCurrentNode().getType();
         }
 
-        // 提取流程编号（从record获取）
-        if (session.getCurrentRecord() != null) {
-            this.submitOperatorId = session.getSubmitOperatorId();
-            this.submitOperatorName = session.getSubmitOperatorName();
-        }
-
         // 提取表单数据
         if (session.getFormData() != null) {
             this.formData = session.getFormData().toMapData();
@@ -169,6 +170,28 @@ public String getCurrentOperatorName(){
         return this.currentOperator.getName();
     }
 
+    /**
+     * 流程审批者Id
+     */
+    public long getSubmitOperatorId(){
+        if(this.submitOperator!=null) {
+            return this.submitOperator.getUserId();
+        }
+        return 0;
+    }
+
+    /**
+     * 流程审批者名称
+     */
+    public String getSubmitOperatorName(){
+        if(this.submitOperator!=null) {
+            return this.submitOperator.getName();
+        }else {
+            return null;
+        }
+    }
+
+
 
     /**
      * 获取开始节点
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java
@@ -54,6 +54,9 @@ public void action() {
             throw FlowStateException.recordAlreadyDone();
         }
 
+        IFlowOperator createdOperator = flowOperatorGateway.get(flowRecord.getCreateOperatorId());
+        IFlowOperator submitOperator = flowOperatorGateway.get(flowRecord.getSubmitOperatorId());
+
         WorkflowRuntime workflowRuntime = workflowService.getWorkflowRuntime(flowRecord.getWorkRuntimeId());
         if (workflowRuntime == null) {
             throw FlowNotFoundException.workflow(flowRecord.getWorkRuntimeId() + " not found");
@@ -79,7 +82,7 @@ public void action() {
         formData.reset(request.getFormData());
         FlowAdvice flowAdvice = request.toFlowAdvice(workflow, flowAction);
 
-        FlowSession session = flowRecord.createFlowSession(this.repositoryHolder,workflow,currentOperator,formData,flowAdvice);
+        FlowSession session = flowRecord.createFlowSession(this.repositoryHolder,workflow,currentOperator,createdOperator,submitOperator,formData,flowAdvice);
         // 验证会话
         currentNode.verifySession(session);
         // 执行动作
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDelayTriggerService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDelayTriggerService.java
@@ -55,6 +55,8 @@ public void trigger() {
         Workflow workflow = workflowRuntime.toWorkflow();
         IFlowNode currentNode = workflow.getFlowNode(flowRecord.getNodeId());
 
+        IFlowOperator createdOperator = flowOperatorGateway.get(flowRecord.getCreateOperatorId());
+        IFlowOperator submitOperator = flowOperatorGateway.get(flowRecord.getSubmitOperatorId());
         IFlowOperator currentOperator = flowOperatorGateway.get(flowRecord.getCurrentOperatorId());
         IFlowAction flowAction = currentNode.actionManager().getActionById(flowRecord.getActionId());
         FormData formData = new FormData(workflow.getForm());
@@ -67,7 +69,7 @@ public void trigger() {
         IFlowNode delayNode = workflow.getFlowNode(delayTask.getDelayNodeId());
 
         // 执行后续任务
-        FlowSession flowSession = new FlowSession(this.repositoryHolder,currentOperator, workflow, delayNode, flowAction, formData, flowRecord, currentRecords, flowRecord.getWorkRuntimeId(), advice);
+        FlowSession flowSession = new FlowSession(this.repositoryHolder,currentOperator,createdOperator,submitOperator, workflow, delayNode, flowAction, formData, flowRecord, currentRecords, flowRecord.getWorkRuntimeId(), advice);
         flowAction.run(flowSession);
 
     }
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java
@@ -32,6 +32,8 @@ public class FlowProcessNodeService {
 
     private final FlowProcessNodeRequest request;
     private final IFlowOperator currentOperator;
+    private IFlowOperator createdOperator;
+    private IFlowOperator submitOperator;
     private final FlowRecordService flowRecordService;
     private final WorkflowService workflowService;
 
@@ -63,6 +65,8 @@ private void loadWorkflow() {
         if (this.request.isCreateWorkflow()) {
             this.workflow = workflowService.getWorkflow(id);
             this.currentNode = this.workflow.getStartNode();
+            this.createdOperator = this.currentOperator;
+            this.submitOperator = null;
         } else {
             FlowRecord flowRecord = flowRecordService.getFlowRecord(Long.parseLong(id));
             if (flowRecord == null) {
@@ -75,6 +79,8 @@ private void loadWorkflow() {
             }
             this.workflow = workflowRuntime.toWorkflow();
             this.currentNode = this.workflow.getFlowNode(flowRecord.getNodeId());
+            this.createdOperator = this.repositoryHolder.getOperatorById(this.flowRecord.getCreateOperatorId());
+            this.submitOperator =  this.repositoryHolder.getOperatorById(this.flowRecord.getSubmitOperatorId());
         }
     }
 
@@ -83,19 +89,19 @@ public List<ProcessNode> processNodes() {
         if (this.flowRecord != null) {
             backupId = this.flowRecord.getWorkRuntimeId();
             // 如果当前记录已结束，则不查询后续流程
-            if(this.flowRecord.isDone()){
-                List<FlowRecord> historyRecords =  flowRecordService.findFlowRecordByProcessId(this.flowRecord.getProcessId());
+            if (this.flowRecord.isDone()) {
+                List<FlowRecord> historyRecords = flowRecordService.findFlowRecordByProcessId(this.flowRecord.getProcessId());
                 for (FlowRecord historyRecord : historyRecords) {
                     ProcessNode processNode = new ProcessNode(historyRecord, this.workflow);
                     nodeList.add(processNode);
                 }
-                if(this.flowRecord.isFinish()){
+                if (this.flowRecord.isFinish()) {
                     nodeList.add(ProcessNode.createEndNode(this.workflow));
-                }else {
+                } else {
                     this.loadNextNode(backupId);
                 }
                 return this.nodeList;
-            }else {
+            } else {
                 // 查询历史记录
                 List<FlowRecord> historyRecords = flowRecordService.findFlowRecordBeforeRecords(flowRecord.getProcessId(), flowRecord.getId());
                 for (FlowRecord historyRecord : historyRecords) {
@@ -111,7 +117,7 @@ public List<ProcessNode> processNodes() {
     }
 
 
-    private void loadNextNode(long backupId){
+    private void loadNextNode(long backupId) {
 
         ActionManager actionManager = currentNode.actionManager();
         IFlowAction flowAction = actionManager.getAction(PassAction.class);
@@ -121,6 +127,8 @@ private void loadNextNode(long backupId){
         FlowSession flowSession = new FlowSession(
                 this.repositoryHolder,
                 this.currentOperator,
+                this.createdOperator,
+                this.submitOperator,
                 this.workflow,
                 this.currentNode,
                 flowAction,
@@ -132,7 +140,7 @@ private void loadNextNode(long backupId){
         );
 
         NextNodeLoader nextNodeLoader = new NextNodeLoader(this.currentNode);
-        List<ProcessNode> nextNodes =  nextNodeLoader.loadNextNode(flowSession);
+        List<ProcessNode> nextNodes = nextNodeLoader.loadNextNode(flowSession);
 
         this.nodeList.addAll(nextNodes);
     }
@@ -170,12 +178,12 @@ private void fetchNextNode(FlowSession flowSession, List<IFlowNode> nexNodes) {
         }
 
         public List<ProcessNode> loadNextNode(FlowSession flowSession) {
-            this.fetchNextNode(flowSession,List.of(this.currentNode));
+            this.fetchNextNode(flowSession, List.of(this.currentNode));
 
             List<ProcessNode> displayNodes = nodeList.stream().filter(ProcessNode::isDisplay).toList();
             List<ProcessNode> processNodeList = new ArrayList<>();
-            for (ProcessNode node:displayNodes){
-                if(!processNodeList.contains(node)){
+            for (ProcessNode node : displayNodes) {
+                if (!processNodeList.contains(node)) {
                     processNodeList.add(node);
                 }
             }
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java b/flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java
@@ -31,21 +31,37 @@ public class FlowSession {
     private final IRepositoryHolder repositoryHolder;
 
     /**
-     * 当前操作者
+     * 流程创建者
      */
+    @Getter
+    private final IFlowOperator createdOperator;
+
+    /**
+     * 流程提交人
+     */
+    @Getter
+    private final IFlowOperator submitOperator;
+
+    /**
+     * 当前审批者
+     */
+    @Getter
     private final IFlowOperator currentOperator;
     /**
      * 当前流程设计
      */
+    @Getter
     private final Workflow workflow;
     /**
      * 当前流程节点
      */
+    @Getter
     private final IFlowNode currentNode;
 
     /**
      * 当前流程动作
      */
+    @Getter
     private final IFlowAction currentAction;
 
     /**
@@ -57,25 +73,31 @@ public class FlowSession {
     /**
      * 当前节点的流程记录
      */
+    @Getter
     private final List<FlowRecord> currentNodeRecords;
 
     /**
      * 当前流程表单数据
      */
+    @Getter
     private final FormData formData;
     /**
      * 流程备份id
      */
+    @Getter
     private final long workflowRuntimeId;
 
     /**
      * 审批意见
      */
+    @Getter
     private final FlowAdvice advice;
 
 
     public FlowSession(IRepositoryHolder repositoryHolder,
                        IFlowOperator currentOperator,
+                       IFlowOperator createdOperator,
+                       IFlowOperator submitOperator,
                        Workflow workflow,
                        IFlowNode currentNode,
                        IFlowAction currentAction,
@@ -94,6 +116,8 @@ public FlowSession(IRepositoryHolder repositoryHolder,
         this.formData = formData;
         this.workflowRuntimeId = workflowRuntimeId;
         this.advice = advice;
+        this.createdOperator = createdOperator;
+        this.submitOperator = submitOperator;
     }
 
 
@@ -137,7 +161,7 @@ public static FlowSession startSession(
             IFlowAction currentAction,
             FormData formData,
             long backupId) {
-        return new FlowSession(repositoryHolder, currentOperator, workflow, currentNode, currentAction, formData, null, new ArrayList<>(), backupId, new FlowAdvice());
+        return new FlowSession(repositoryHolder, currentOperator, currentOperator,null,workflow, currentNode, currentAction, formData, null, new ArrayList<>(), backupId, new FlowAdvice());
     }
 
 
@@ -209,12 +233,6 @@ public IFlowNode getStartNode() {
         return workflow.getStartNode();
     }
 
-    /**
-     * 获取流程的创建者
-     */
-    public IFlowOperator getCreatedOperator() {
-        return workflow.getCreatedOperator();
-    }
 
 
     /**
@@ -287,7 +305,7 @@ public Object getFormData(String fieldCode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowNode currentNode) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
+        return new FlowSession(repositoryHolder,currentOperator,createdOperator,submitOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
 
@@ -298,7 +316,7 @@ public FlowSession updateSession(IFlowNode currentNode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowAction currentAction) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
+        return new FlowSession(repositoryHolder,currentOperator,createdOperator,submitOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
     /**
@@ -308,7 +326,7 @@ public FlowSession updateSession(IFlowAction currentAction) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowOperator currentOperator) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
+        return new FlowSession(repositoryHolder,currentOperator,createdOperator,submitOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
     /**
diff --git a/flow-engine-framework/src/test/java/com/codingapi/flow/integration/NodeTitleIntegrationTest.java b/flow-engine-framework/src/test/java/com/codingapi/flow/integration/NodeTitleIntegrationTest.java
diff --git a/flow-engine-framework/src/test/java/com/codingapi/flow/script/node/NodeTitleScriptTest.java b/flow-engine-framework/src/test/java/com/codingapi/flow/script/node/NodeTitleScriptTest.java
diff --git a/flow-frontend b/flow-frontend
