|
@@ -465,7 +465,7 @@ class UserServices extends BaseServices
|
|
|
$userlabel = $this->getUserLablel($uids);
|
|
|
$userGroup = app()->make(UserGroupServices::class)->getUsersGroupName(array_unique(array_column($list, 'group_id')));
|
|
|
$userExtract = app()->make(UserExtractServices::class)->getUsersSumList($uids);
|
|
|
- $levelName = app()->make(SystemUserLevelServices::class)->getUsersLevel(array_unique(array_column($list, 'level')));
|
|
|
+// $levelName = app()->make(SystemUserLevelServices::class)->getUsersLevel(array_unique(array_column($list, 'level')));
|
|
|
// $userLevel = app()->make(UserLevelServices::class)->getUsersLevelInfo($uids);
|
|
|
$spreadUids = array_unique(array_column($list, 'spread_uid'));
|
|
|
$spread_names = $this->dao->getColumn([['uid', 'in', $spreadUids]], 'nickname', 'uid');
|
|
@@ -513,13 +513,14 @@ class UserServices extends BaseServices
|
|
|
$item['sex'] = '女';
|
|
|
} else $item['sex'] = '保密';
|
|
|
//等级名称
|
|
|
-// $item['level'] = $levelName[$item['level']] ?? '无';
|
|
|
+ $levelinfo = app()->make(UserLevelServices::class)->getUserLevel($item['uid']);
|
|
|
+ $item['level'] = $levelinfo['name'] ?? '无';
|
|
|
//分组名称
|
|
|
$item['group_id'] = $userGroup[$item['group_id']] ?? '无';
|
|
|
//用户等级
|
|
|
$item['vip_name'] = false;
|
|
|
// $levelinfo = $userLevel[$item['uid']] ?? null;
|
|
|
- $levelinfo = app()->make(UserLevelServices::class)->getUserLevel($item['uid']);
|
|
|
+
|
|
|
if ($levelinfo) {
|
|
|
if ($levelinfo && ($levelinfo['is_forever'] || time() < $levelinfo['valid_time'])) {
|
|
|
$item['vip_name'] = $levelinfo['name'] != '无' ? $levelinfo['name'] : false;
|