wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

被覆盖？

This commit is contained in:
wangliwen 2022-05-20 18:24:21 +08:00
parent 2d40ab3eb1
commit 1091344da1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

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