diff --git a/workflow/engine/src/BusinessModel/Cases.php b/workflow/engine/src/BusinessModel/Cases.php index 84b662901..7f57b9467 100644 --- a/workflow/engine/src/BusinessModel/Cases.php +++ b/workflow/engine/src/BusinessModel/Cases.php @@ -45,6 +45,7 @@ class Cases $user = isset( $dataList["user"] ) ? $dataList["user"] : ""; $search = isset( $dataList["search"] ) ? $dataList["search"] : ""; $action = isset( $dataList["action"] ) ? $dataList["action"] : "todo"; + $paged = isset( $dataList["paged"] ) ? $dataList["paged"] : true; $type = "extjs"; $dateFrom = isset( $dataList["dateFrom"] ) ? substr( $dataList["dateFrom"], 0, 10 ) : ""; $dateTo = isset( $dataList["dateTo"] ) ? substr( $dataList["dateTo"], 0, 10 ) : ""; @@ -123,7 +124,9 @@ class Cases $callback, $dir, (strpos($sort, ".") !== false)? $sort : "APP_CACHE_VIEW." . $sort, - $category + $category, + true, + $paged ); } if (!empty($result['data'])) { @@ -131,6 +134,19 @@ class Cases $value = array_change_key_case($value, CASE_LOWER); } } + if ($paged == false) { + $result = $result['data']; + } else { + $result['total'] = $result['totalCount']; + unset($result['totalCount']); + + $result['start'] = $start; + $result['limit'] = $limit; + $result['sort'] = $sort; + $result['category'] = $category; + $result['process'] = $process; + $result['search'] = $search; + } return $result; }