From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
index fbd5ab7..2829256 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
@@ -50,7 +50,7 @@
/**
* 娴佺▼瀹炰緥 Convert
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface BpmProcessInstanceConvert {
@@ -107,9 +107,13 @@
BpmProcessInstanceRespVO respVO = BeanUtils.toBean(processInstance, BpmProcessInstanceRespVO.class);
respVO.setStatus(FlowableUtils.getProcessInstanceStatus(processInstance))
.setFormVariables(FlowableUtils.getProcessInstanceFormVariable(processInstance));
- // definition
- respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
- copyTo(processDefinitionInfo, respVO.getProcessDefinition());
+ // definition锛堟祦绋嬪畾涔夊彲鑳藉凡琚垹闄わ紝闇�瑕佸閿欙紝鍚﹀垯鍓嶇鎷垮埌 500锛�
+ if (processDefinition != null) {
+ respVO.setProcessDefinition(BeanUtils.toBean(processDefinition, BpmProcessDefinitionRespVO.class));
+ if (respVO.getProcessDefinition() != null && processDefinitionInfo != null) {
+ copyTo(processDefinitionInfo, respVO.getProcessDefinition());
+ }
+ }
// user
if (startUser != null) {
respVO.setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
--
Gitblit v1.9.3