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 processVariable = task.getProcessVariables(); + processVariable.putAll(task.getProcessVariables()); TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.get(Long.valueOf(dto.getBusinessKey())); if (abilityApplicationDTO != null) { Map 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 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 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 variables = oMapper.convertValue(resourceDTO, Map.class); - dto.setParams(variables); + processVariable.putAll(variables); + dto.setParams(processVariable); listDto.add(dto); continue; }