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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-27 14:50:19 +08:00
parent c15aa57b38 de01721f5e
commit 4b75cde5eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
View File

@ -124,8 +124,9 @@ public class ActTaskController {
TaskDTO taskDTO = JSON.parseObject(JSON.toJSONString(index), TaskDTO.class); TaskDTO taskDTO = JSON.parseObject(JSON.toJSONString(index), TaskDTO.class);
return taskDTO; return taskDTO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
page.getList().addAll(meetingroom_bookTaskDto); List<TaskDTO> temp = page.getList();
page.setList(page.getList()); temp.addAll(meetingroom_bookTaskDto);
page.setList(temp);
} }
} }
return new Result<PageData<TaskDTO>>().ok(page); return new Result<PageData<TaskDTO>>().ok(page);