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:29:59 +08:00
parent 1091344da1
commit 07711e2928
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ public class ActTaskService extends BaseServiceImpl {
}
}
taskQuery.orderByTaskCreateTime().desc();
List<Task> list = taskQuery.active().includeProcessVariables().includeTaskLocalVariables().listPage((curPage - 1) * limit, limit);
List<Task> list = taskQuery.active().includeProcessVariables().listPage((curPage - 1) * limit, limit);
List<TaskDTO> listDto = new ArrayList<>();
for (Task task : list) {
TaskDTO dto = new TaskDTO();
@ -135,7 +135,6 @@ public class ActTaskService extends BaseServiceImpl {
Map<String, Object> variables = oMapper.convertValue(abilityApplicationDTO, Map.class);
processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables());
processVariable.putAll(task.getTaskLocalVariables());
dto.setParams(processVariable);
listDto.add(dto);
continue;
@ -145,7 +144,6 @@ public class ActTaskService extends BaseServiceImpl {
Map<String, Object> variables = oMapper.convertValue(resourceMountApplyDTO, Map.class);
processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables());
processVariable.putAll(task.getTaskLocalVariables());
dto.setParams(processVariable);
listDto.add(dto);
continue;
@ -155,7 +153,6 @@ public class ActTaskService extends BaseServiceImpl {
Map<String, Object> variables = oMapper.convertValue(tDemandDataDTO, Map.class);
processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables());
processVariable.putAll(task.getTaskLocalVariables());
dto.setParams(processVariable);
listDto.add(dto);
continue;
@ -165,7 +162,6 @@ public class ActTaskService extends BaseServiceImpl {
Map<String, Object> variables = oMapper.convertValue(resourceDTO, Map.class);
processVariable.putAll(variables);
processVariable.putAll(task.getProcessVariables());
processVariable.putAll(task.getTaskLocalVariables());
dto.setParams(processVariable);
listDto.add(dto);
continue;