fix script

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowContent.java

@@ -101,12 +101,12 @@ public class FlowContent {
     private boolean mergeable;
 
     /**
-     * 发起者id
+     * 流程发起者
      */
     private FlowOperator createOperator;
 
     /**
-     * 当前审批者id
+     * 当前审批者
      */
     private FlowOperator currentOperator;
 
@@ -203,6 +203,7 @@ public void pushRecords(FlowRecord record, List<FlowRecord> mergeRecords) {
         for (FlowRecord item : mergeRecords) {
             Body body = new Body();
             body.setRecordId(item.getId());
+            body.setSubmitOperator(new FlowOperator(item.getSubmitOperatorId(),item.getSubmitOperatorName()));
             body.setTitle(item.getTitle());
             body.setData(item.getFormData());
             body.setRecordState(item.getRecordState());
@@ -291,6 +292,14 @@ public static class Body {
          * 流程标题
          */
         private String title;
+
+
+        /**
+         * 提交审批者
+         */
+        private FlowOperator submitOperator;
+
+
         /**
          * 表单数据
          */

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowRecordContent.java

@@ -60,6 +60,16 @@ public class FlowRecordContent {
      */
     private String currentOperatorName;
 
+    /**
+     * 提交审批人Id
+     */
+    private Long submitOperatorId;
+
+    /**
+     * 提交审批人名称
+     */
+    private String submitOperatorName;
+
     /**
      * 创建时间
      */
@@ -127,6 +137,8 @@ public static FlowRecordContent convert(FlowRecord record){
         content.setReadTime(record.getReadTime());
         content.setCurrentOperatorId(record.getCurrentOperatorId());
         content.setCurrentOperatorName(record.getCurrentOperatorName());
+        content.setSubmitOperatorId(record.getSubmitOperatorId());
+        content.setSubmitOperatorName(record.getSubmitOperatorName());
         content.setCreateTime(record.getCreateTime());
         content.setCreateOperatorId(record.getCreateOperatorId());
         content.setCreateOperatorName(record.getCreateOperatorName());
@@ -152,6 +164,8 @@ public static FlowRecordContent convert(FlowTodoRecord todoRecord){
         content.setReadTime(todoRecord.getReadTime());
         content.setCurrentOperatorId(todoRecord.getCurrentOperatorId());
         content.setCurrentOperatorName(todoRecord.getCurrentOperatorName());
+        content.setSubmitOperatorId(todoRecord.getSubmitOperatorId());
+        content.setSubmitOperatorName(todoRecord.getSubmitOperatorName());
         content.setCreateTime(todoRecord.getCreateTime());
         content.setCreateOperatorId(todoRecord.getCreateOperatorId());
         content.setCreateOperatorName(todoRecord.getCreateOperatorName());

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -133,6 +133,16 @@ public class FlowRecord {
      */
     private String currentOperatorName;
 
+    /**
+     * 提交审批人Id
+     */
+    private long submitOperatorId;
+
+    /**
+     * 提交审批人名称
+     */
+    private String submitOperatorName;
+
     /**
      * 代替的审批人Id
      */
@@ -293,6 +303,9 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         this.currentOperatorId = currentOperator.getUserId();
         this.currentOperatorName = currentOperator.getName();
 
+        this.submitOperatorId = flowSession.getSubmitOperatorId();
+        this.submitOperatorName = flowSession.getSubmitOperatorName();
+
         this.advice = flowSession.getAdvice().getAdvice();
         this.signKey = flowSession.getAdvice().getSignKey();
         this.flowState = SATE_FLOW_RUNNING;

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -69,6 +69,16 @@ public class FlowTodoRecord {
      */
     private String currentOperatorName;
 
+    /**
+     * 提交审批人Id
+     */
+    private long submitOperatorId;
+
+    /**
+     * 提交审批人名称
+     */
+    private String submitOperatorName;
+
     /**
      * 创建时间
      */
@@ -129,6 +139,8 @@ public void update(FlowRecord flowRecord) {
         this.readTime = flowRecord.getReadTime();
         this.currentOperatorId = flowRecord.getCurrentOperatorId();
         this.currentOperatorName = flowRecord.getCurrentOperatorName();
+        this.submitOperatorId = flowRecord.getSubmitOperatorId();
+        this.submitOperatorName = flowRecord.getSubmitOperatorName();
         this.createTime = flowRecord.getCreateTime();
         this.createOperatorId = flowRecord.getCreateOperatorId();
         this.createOperatorName = flowRecord.getCreateOperatorName();

flow-engine-framework/src/main/java/com/codingapi/flow/script/ScriptDefaultConstants.java

@@ -67,7 +67,7 @@ def run(request){
             // @SCRIPT_TITLE 流程创建者 
             // @SCRIPT_META {"type":"creator"}
             def run(request){
-                return [request.getCreatedOperator()]
+                return [request.getCreatedOperatorId()]
             }
             """;
 

flow-engine-framework/src/main/java/com/codingapi/flow/script/node/OperatorLoadScript.java

@@ -8,6 +8,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,7 +24,12 @@ public class OperatorLoadScript {
     @SuppressWarnings("unchecked")
     public List<IFlowOperator> execute(FlowSession session) {
         GroovyScriptRequest request = new GroovyScriptRequest(session);
-        return ScriptRuntimeContext.getInstance().run(script, List.class, request);
+        List<Object> userIds = ScriptRuntimeContext.getInstance().run(script, List.class, request);
+        List<Long> operatorIds = new ArrayList<>();
+        for (Object userId : userIds) {
+            operatorIds.add(Long.parseLong(String.valueOf(userId)));
+        }
+        return session.getRepositoryHolder().findOperatorByIds(operatorIds);
     }
 
     /**

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptBind.java

@@ -20,18 +20,10 @@ public class GroovyScriptBind {
 
     private final FlowScriptContext context;
 
-    public ErrorThrow createErrorThrow(IFlowOperator operator) {
-        return context.createErrorThrow(operator);
-    }
-
     public ErrorThrow createErrorThrow(IFlowNode node) {
         return context.createErrorThrow(node);
     }
 
-    public ErrorThrow createErrorThrow(IFlowOperator... operators) {
-        return context.createErrorThrow(operators);
-    }
-
     public ErrorThrow createErrorThrow(List<Long> userIds) {
         return context.createErrorThrow(userIds);
     }

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java

@@ -18,24 +18,6 @@
  */
 public class GroovyScriptRequest {
 
-    /**
-     * 当前操作人姓名
-     */
-    @Getter
-    private String operatorName;
-
-    /**
-     * 当前操作人ID
-     */
-    @Getter
-    private long operatorId;
-
-    /**
-     * 是否流程管理员
-     */
-    @Getter
-    private Boolean isFlowManager;
-
     /**
      * 流程标题
      */
@@ -54,12 +36,6 @@ public class GroovyScriptRequest {
     @Getter
     private String workCode;
 
-    /**
-     * 流程创建人姓名
-     */
-    @Getter
-    private String creatorName;
-
     /**
      * 当前节点名称
      */
@@ -86,15 +62,26 @@ public class GroovyScriptRequest {
     private IFlowOperator createdOperator;
 
     /**
-     * 当前操作人（上一节点审批人）
+     * 当前审批人
      */
     @Getter
     private IFlowOperator currentOperator;
 
+    /**
+     * 流程提交Id
+     */
+    @Getter
+    private long submitOperatorId;
 
-    private final FlowSession flowSession;
+    /**
+     * 流程提交人姓名
+     */
+    @Getter
+    private String submitOperatorName;
 
 
+    private final FlowSession flowSession;
+
     /**
      * 从FlowSession构建请求对象（模板方法模式）
      * @param session 流程会话（不能为null）
@@ -104,17 +91,15 @@ public GroovyScriptRequest(FlowSession session) {
         // 提取操作人信息
         if (session.getCurrentOperator() != null) {
             this.currentOperator = session.getCurrentOperator();
-            this.operatorName = session.getCurrentOperator().getName();
-            this.operatorId = (int) session.getCurrentOperator().getUserId();
-            this.isFlowManager = session.getCurrentOperator().isFlowManager();
         }
 
         // 提取流程信息
         if (session.getWorkflow() != null) {
             this.workflowTitle = session.getWorkflow().getTitle();
             this.workflowCode = session.getWorkflow().getCode();
+            // 提取创建人信息
             if (session.getWorkflow().getCreatedOperator() != null) {
-                this.creatorName = session.getWorkflow().getCreatedOperator().getName();
+                this.createdOperator = session.getWorkflow().getCreatedOperator();
             }
         }
 
@@ -127,18 +112,15 @@ public GroovyScriptRequest(FlowSession session) {
         // 提取流程编号（从record获取）
         if (session.getCurrentRecord() != null) {
             this.workCode = session.getCurrentRecord().getWorkCode();
+            this.submitOperatorId = session.getSubmitOperatorId();
+            this.submitOperatorName = session.getSubmitOperatorName();
         }
 
         // 提取表单数据
         if (session.getFormData() != null) {
             this.formData = session.getFormData().toMapData();
         }
 
-        // 提取创建人信息
-        if (session.getWorkflow() != null && session.getWorkflow().getCreatedOperator() != null) {
-            this.createdOperator = session.getWorkflow().getCreatedOperator();
-        }
-
     }
 
     /**
@@ -147,7 +129,37 @@ public GroovyScriptRequest(FlowSession session) {
      * @return 节点
      */
     public IFlowNode getNode(String nodeId){
-        return flowSession.getWorkflow().getFlowNode(nodeId);
+        return flowSession.getNode(nodeId);
+    }
+
+
+    /**
+     * 流程创建者Id
+     */
+    public long getCreatedOperatorId(){
+        return this.createdOperator.getUserId();
+    }
+
+    /**
+     * 流程创建者名称
+     */
+    public String getCreatedOperatorName(){
+        return this.createdOperator.getName();
+    }
+
+
+    /**
+     * 流程审批者Id
+     */
+    public long getCurrentOperatorId(){
+        return this.currentOperator.getUserId();
+    }
+
+    /**
+     * 流程审批者名称
+     */
+    public String getCurrentOperatorName(){
+        return this.currentOperator.getName();
     }
 
 

flow-engine-framework/src/main/java/com/codingapi/flow/script/runtime/FlowScriptContext.java

@@ -33,18 +33,6 @@ public ErrorThrow createErrorThrow(IFlowNode node) {
                 .build();
     }
 
-    public ErrorThrow createErrorThrow(IFlowOperator... operators) {
-        return ErrorThrow.builder()
-                .operators(List.of(operators))
-                .build();
-    }
-
-    public ErrorThrow createErrorThrow(IFlowOperator operator) {
-        return ErrorThrow.builder()
-                .operators(List.of(operator))
-                .build();
-    }
-
     public ErrorThrow createErrorThrow(List<Long> userIds) {
         List<IFlowOperator> operators = beanFactory.findOperatorsByIds(userIds);
         return ErrorThrow.builder()

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -179,6 +179,27 @@ public IFlowOperator getCreatedOperator() {
         return workflow.getCreatedOperator();
     }
 
+
+    /**
+     * 获取流程的提交者Id
+     */
+    public long getSubmitOperatorId(){
+        if(this.currentRecord!=null) {
+            return this.currentRecord.getCurrentOperatorId();
+        }
+        return 0;
+    }
+
+    /**
+     * 获取流程的提交者名称
+     */
+    public String getSubmitOperatorName(){
+        if(this.currentRecord!=null) {
+            return this.currentRecord.getCurrentOperatorName();
+        }
+        return null;
+    }
+
     /**
      * 获取流程设计编号
      */
@@ -253,4 +274,11 @@ public FlowSession updateSession(IFlowOperator currentOperator) {
         return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
+    /**
+     * 获取节点
+     * @param nodeId 节点id
+     */
+    public IFlowNode getNode(String nodeId) {
+        return this.workflow.getFlowNode(nodeId);
+    }
 }