From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index 90c3888..8f3643a 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -51,7 +51,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱娴佺▼瀹氫箟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
public CommonResult<PageResult<BpmProcessDefinitionRespVO>> getProcessDefinitionPage(
BpmProcessDefinitionPageReqVO pageReqVO) {
PageResult<ProcessDefinition> pageResult = processDefinitionService.getProcessDefinitionPage(pageReqVO);
@@ -97,8 +96,11 @@
});
// 2. 鎷兼帴 VO 杩斿洖
+ // 琛ュ厖琛ㄥ崟淇℃伅锛氬巻鍙查儴缃� / 閰嶇疆瀵煎叆鐨勬祦绋嬪畾涔夊彲鑳芥病鏈� formConf銆乫ormFields锛屾寜 formId 浠� bpm_form 鍥炶
+ Map<Long, BpmFormDO> formMap = formService.getFormMap(
+ convertSet(processDefinitionMap.values(), BpmProcessDefinitionInfoDO::getFormId));
return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinitionList(
- list, null, processDefinitionMap, null, null));
+ list, null, processDefinitionMap, formMap, null));
}
@GetMapping("/simple-list")
@@ -126,8 +128,11 @@
}
BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId());
BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId());
+ // 鏅�氳〃鍗曞厹搴曪細鎸� formId 鍥炶 bpm_form锛岄伩鍏� formConf銆乫ormFields 涓虹┖瀵艰嚧鍙戣捣娴佺▼椤佃〃鍗曠┖鐧�
+ BpmFormDO form = processDefinitionInfo != null && processDefinitionInfo.getFormId() != null
+ ? formService.getForm(processDefinitionInfo.getFormId()) : null;
return success(BpmProcessDefinitionConvert.INSTANCE.buildProcessDefinition(
- processDefinition, null, processDefinitionInfo, null, null, bpmnModel));
+ processDefinition, null, processDefinitionInfo, form, null, bpmnModel));
}
}
--
Gitblit v1.9.3