|
|
@@ -792,7 +792,6 @@ class ConfigController extends BaseController {
|
|
|
} else {
|
|
|
$oneData = include $path;
|
|
|
}
|
|
|
-
|
|
|
return static::notice($oneData);
|
|
|
}
|
|
|
|
|
|
@@ -864,12 +863,15 @@ class ConfigController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- array_values($user_info);
|
|
|
- $totalCount = count($user_info['list']);
|
|
|
- $limit = ($page - 1) * $pageSize;
|
|
|
- $user_info['list'] = array_slice($user_info['list'],$limit,$pageSize);
|
|
|
- $user_info['totalCount'] = $totalCount;
|
|
|
- $user_info['pageSize'] = $pageSize;
|
|
|
+ if($user_info){
|
|
|
+ $user_info['list'] = array_values($user_info['list']);
|
|
|
+ $totalCount = count($user_info['list']);
|
|
|
+ $limit = ($page - 1) * $pageSize;
|
|
|
+ array_multisort(array_column($user_info['list'],'UPDATE_TIME'), SORT_DESC,$user_info['list']);
|
|
|
+ $user_info['list'] = array_slice($user_info['list'],$limit,$pageSize);
|
|
|
+ $user_info['totalCount'] = $totalCount;
|
|
|
+ $user_info['pageSize'] = $pageSize;
|
|
|
+ }
|
|
|
return static::notice($user_info);
|
|
|
}
|
|
|
|