From 46851b85f9aa7b39b14bcf84730f6f72e4b8e391 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 20 May 2022 11:05:35 +0800
Subject: [PATCH] ...

---
 .../modules/activiti/service/ActTaskService.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
index f1e2651a..4013a3b6 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
@@ -127,33 +127,39 @@ public class ActTaskService extends BaseServiceImpl {
             TaskDTO dto = new TaskDTO();
             this.convertTaskInfo(task, dto);
             ObjectMapper oMapper = new ObjectMapper();
+            Map<String, Object> processVariable = task.getProcessVariables();
+            processVariable.putAll(task.getProcessVariables());
 
             TAbilityApplicationDTO abilityApplicationDTO =
                     tAbilityApplicationService.get(Long.valueOf(dto.getBusinessKey()));
             if (abilityApplicationDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(abilityApplicationDTO, Map.class);
-                dto.setParams(variables);
+                processVariable.putAll(variables);
+                dto.setParams(processVariable);
                 listDto.add(dto);
                 continue;
             }
             TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
             if (resourceMountApplyDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(resourceMountApplyDTO, Map.class);
-                dto.setParams(variables);
+                processVariable.putAll(variables);
+                dto.setParams(processVariable);
                 listDto.add(dto);
                 continue;
             }
             TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
             if (tDemandDataDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(tDemandDataDTO, Map.class);
-                dto.setParams(variables);
+                processVariable.putAll(variables);
+                dto.setParams(processVariable);
                 listDto.add(dto);
                 continue;
             }
             ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
             if (resourceDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(resourceDTO, Map.class);
-                dto.setParams(variables);
+                processVariable.putAll(variables);
+                dto.setParams(processVariable);
                 listDto.add(dto);
                 continue;
             }