diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index fcd59455..34216ab8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -468,9 +468,9 @@ public class WorkFlowController { Page page= workFlowFeignClient.allProcess(taskCommonQuery); PageInfo pageInfo= new PageInfo(); 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; }