diff --git a/app/controller/admin/user/User.php b/app/controller/admin/user/User.php index 527e785..094fee2 100644 --- a/app/controller/admin/user/User.php +++ b/app/controller/admin/user/User.php @@ -88,7 +88,18 @@ class User extends BaseController 'is_svip', ]); [$page, $limit] = $this->getPage(); - return app('json')->success($this->repository->getList($where, $page, $limit)); + $result = $this->repository->getList($where, $page, $limit); + // 循环处理数据 + $config = systemConfig(['extension_limit', 'extension_limit_day']); + foreach($result['list'] as &$userInfo){ + $userInfo['is_temporary'] = 0; + if($config['extension_limit'] && $config['extension_limit_day'] && $userInfo['spread_limit'] && $userInfo['spread_fixed'] == 0) { + $userInfo['is_temporary'] = 1; + } + } + + + return app('json')->success($result); } public function spreadList($uid) diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php index 124dc57..dcf5d79 100644 --- a/app/controller/api/user/User.php +++ b/app/controller/api/user/User.php @@ -259,7 +259,7 @@ class User extends BaseController $uid = $this->request->uid(); $result = $level == 2 ? $this->repository->getTwoLevelList($uid,$where,$page,$limit) : $this->repository->getOneLevelList($uid,$where,$page,$limit); // 循环处理数据 - $config = systemConfig(['extension_limit', 'extension_limit_day', 'integral_user_give']); + $config = systemConfig(['extension_limit', 'extension_limit_day']); foreach($result['list'] as &$spreadInfo){ $spreadInfo['is_temporary'] = 0; if($config['extension_limit'] && $config['extension_limit_day'] && $spreadInfo['spread_limit'] && $spreadInfo['spread_fixed'] == 0) {