|
|
@@ -60,11 +60,6 @@ class UserClass extends BaseClass
|
|
|
$ids = array_column($list, 'id');
|
|
|
$ids = array_unique($ids);
|
|
|
$asset = UserAssetClass::getByUserIds($ids, 'userId');
|
|
|
-
|
|
|
- $merchantIdList = array_column($list, 'merchantId');
|
|
|
- $merchantIdList = array_filter(array_unique($merchantIdList));
|
|
|
- $merchantList = MerchantService::getByIds($merchantIdList, null, 'id');
|
|
|
-
|
|
|
foreach ($list as $key => $val) {
|
|
|
$userId = $val['id'];
|
|
|
//访问时间
|
|
|
@@ -77,8 +72,7 @@ class UserClass extends BaseClass
|
|
|
//客户发来新消息数
|
|
|
$list[$key]['unReadNum'] = ChatClass::getUnreadNum($userId);
|
|
|
$list[$key] = business::formatUserAvatar($list[$key]);
|
|
|
- $merchantId = $val['merchantId'];
|
|
|
- $list[$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
|
|
|
+ $list[$key]['merchantName'] = '';
|
|
|
//敏感信息不要输出
|
|
|
if ($sensitive) {
|
|
|
unset($list[$key]['password']);
|