From d07dc79e449e0c5fd36d8630271f59af68b7e21b Mon Sep 17 00:00:00 2001 From: bob Date: Tue, 3 Jan 2023 18:37:36 +0800 Subject: [PATCH] fix(flowRecord) process variable --- .../web/controller/system/SysProjectController.java | 2 +- .../flowable/service/impl/FlowTaskServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProjectController.java index b76f9c9..4d0f3cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProjectController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProjectController.java @@ -45,7 +45,7 @@ public class SysProjectController extends BaseController /** * 查询项目列表 */ - @PreAuthorize("@ss.hasPermi('system:project:list')") +// @PreAuthorize("@ss.hasPermi('system:project:list')") @GetMapping("/option") public AjaxResult option() { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index 08334bd..5097af0 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -748,12 +748,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask // } } // 第一次申请获取初始化表单 - if (StringUtils.isNotBlank(deployId)) { - SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId); - if (Objects.isNull(sysForm)) { - return AjaxResult.error("请先配置流程表单"); - } - map.put("formData", JSONObject.parseObject(sysForm.getFormContent())); + if (StringUtils.isNotBlank(procInsId)) { + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() + .processInstanceId(procInsId) + .includeProcessVariables() + .singleResult(); + map.put("form", processInstance.getProcessVariables()); } return AjaxResult.success(map); }