FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-09-02 16:30:12 +08:00
parent 0e4d7b6a32 46a85a54ae
commit 5fdf3fa9ae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -3
View File
@@ -468,9 +468,9 @@ public class WorkFlowController {
Page page= workFlowFeignClient.allProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
pageInfo.setPageNo(taskCommonQuery.getCurrent());
pageInfo.setList(page.getList());
pageInfo.setCount(page.getCount());
pageInfo.setPageSize(page.getPageSize());
pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList());
pageInfo.setCount(page.getCount() == null ? 0 : page.getCount());
pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize());
return pageInfo;
}