|
@@ -251,7 +251,11 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
|
|
|
if (orderType!=null&&!orderType.equals("undifined")&&!orderType.equals("")){
|
|
|
mapValue.put("orderType",orderType);
|
|
|
}
|
|
|
- PageHelper.startPage(pageNum,pageSize);
|
|
|
+ if (pageNum==null||pageSize==null){
|
|
|
+
|
|
|
+ }else {
|
|
|
+ PageHelper.startPage(pageNum,pageSize);
|
|
|
+ }
|
|
|
//分页数据
|
|
|
List<Map<String, Object>> result = tmstruckTimeTaskResultService.getAllTimeTaskResult(mapValue);
|
|
|
PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,result);
|