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 92623655..1642fea9 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 @@ -128,14 +128,14 @@ public class ActTaskService extends BaseServiceImpl { this.convertTaskInfo(task, dto); ObjectMapper oMapper = new ObjectMapper(); Map processVariable = new LinkedHashMap<>(); - processVariable.putAll(task.getProcessVariables()); - processVariable.putAll(task.getTaskLocalVariables()); TAbilityApplicationDTO abilityApplicationDTO = tAbilityApplicationService.get(Long.valueOf(dto.getBusinessKey())); if (abilityApplicationDTO != null) { Map variables = oMapper.convertValue(abilityApplicationDTO, Map.class); processVariable.putAll(variables); + processVariable.putAll(task.getProcessVariables()); + processVariable.putAll(task.getTaskLocalVariables()); dto.setParams(processVariable); listDto.add(dto); continue; @@ -144,6 +144,8 @@ public class ActTaskService extends BaseServiceImpl { if (resourceMountApplyDTO != null) { Map variables = oMapper.convertValue(resourceMountApplyDTO, Map.class); processVariable.putAll(variables); + processVariable.putAll(task.getProcessVariables()); + processVariable.putAll(task.getTaskLocalVariables()); dto.setParams(processVariable); listDto.add(dto); continue; @@ -152,6 +154,8 @@ public class ActTaskService extends BaseServiceImpl { if (tDemandDataDTO != null) { Map variables = oMapper.convertValue(tDemandDataDTO, Map.class); processVariable.putAll(variables); + processVariable.putAll(task.getProcessVariables()); + processVariable.putAll(task.getTaskLocalVariables()); dto.setParams(processVariable); listDto.add(dto); continue; @@ -160,6 +164,8 @@ public class ActTaskService extends BaseServiceImpl { if (resourceDTO != null) { Map variables = oMapper.convertValue(resourceDTO, Map.class); processVariable.putAll(variables); + processVariable.putAll(task.getProcessVariables()); + processVariable.putAll(task.getTaskLocalVariables()); dto.setParams(processVariable); listDto.add(dto); continue;