|
|
@@ -116,8 +116,15 @@ class ShopAdminService extends BaseService
|
|
|
if (empty($list)) {
|
|
|
return $data;
|
|
|
}
|
|
|
+ $roleIds = array_column($list, 'roleId');
|
|
|
+ $roleIds = array_filter(array_unique($roleIds));
|
|
|
+ $roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
|
|
|
foreach ($list as $key => $val) {
|
|
|
$list[$key]['avatar'] = imgUtil::groupImg($val['avatar']);
|
|
|
+ $roleId = $val['roleId'];
|
|
|
+ $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
|
|
|
+ $list[$key]['roleName'] = $roleName;
|
|
|
+
|
|
|
}
|
|
|
$data['list'] = $list;
|
|
|
return $data;
|