..

2025-07-31 10:36:02 +08:00
parent 73974dbdd3
commit 8118ea9687
21 changed files with 472 additions and 333 deletions
@@ -219,12 +219,6 @@ public interface ProcessInstanceService extends BaseService<ProcessInstance> {
     * @param actorId
     */
    void updateCCStatus(Long processInstanceId, String actorId);
-    /**
-     * 自定义分页查询我的抄送
-     * @param param
-     * @return
-     */
-//    CommonPage<ProcessInstanceVO> ccInstancePage(ProcessInstancePageParam param);

    /**
     * 获取流程参与人回显文本数据
@@ -117,6 +117,7 @@ public class ProcessDefineServiceImpl extends BaseServiceImpl<ProcessDefine> imp
        define.setH5InstanceViewUrl(processModel.getH5InstanceViewUrl());
        define.setIcon(processModel.getIcon());
        define.setPinyinName(PinyinUtil.getFirstLetter(define.getDisplayName().charAt(0)));
+        define.setDescription(processModel.getDescription());

        define.setState(1);
        define.setContent(JSONUtil.parseObj(defineJsonStr));
@@ -175,8 +175,18 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
        processTask.setTaskType(taskModel.getTaskType().getCode());
        processTask.setFormKey(taskModel.getForm());
        processTask.setProcessInstanceId(execution.getProcessInstanceId());
-        execution.getArgs().put(FlowConst.IS_FIRST_TASK_NODE, FlowUtil.isFistTaskName(execution.getProcessModel(), taskModel.getName()));
+
        // 增加是否为第一个任务节点标识
+        execution.getArgs().put(FlowConst.IS_FIRST_TASK_NODE, FlowUtil.isFistTaskName(execution.getProcessModel(), taskModel.getName()));
+        //过滤上个任务的表单数据 避免造成污染 每个任务只保存自己的表单数据
+        Dict cleanArgs = Dict.create();
+        execution.getArgs().forEach((k, v) -> {
+            if (!k.startsWith(FlowConst.TASK_FORM_DATA_PREFIX)) {
+                cleanArgs.set(k, v);
+            }
+        });
+        execution.setArgs(cleanArgs);
+
        processTask.setVariable(JSONUtil.toJsonStr(execution.getArgs()));
        processTask.setCreatedAt(now);
        processTask.setUpdatedAt(now);