|
|
@@ -146,9 +146,9 @@ define(['app/app'], function (app) {
|
|
|
$defer.resolve(page.content);
|
|
|
}
|
|
|
$scope.infoCommon = page
|
|
|
- $scope.infoCommon.all = page.content.length
|
|
|
- $scope.ALLList = page.content
|
|
|
- $scope.totalCount = page.totalElement;
|
|
|
+ $scope.infoCommon.all = page.content && page.content.length || 0
|
|
|
+ $scope.ALLList = page.content || []
|
|
|
+ $scope.totalCount = page.totalElement || 0;
|
|
|
}, function (response) {
|
|
|
$scope.loading = false;
|
|
|
toaster.pop('error', '数据加载失败', response.data);
|