admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

market_members_128

Browse Source
This commit is contained in:
dengbw
2023-01-28 15:44:04 +08:00
parent 140a2ccef3
commit 9afc059182
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
market/controllers/api/sylive/Members.php
+11 -8
View File
@@ -69,7 +69,7 @@ class Members extends BaseController
, ["organizationId in({$str_organizationIds})" => null]);
}
foreach ($res as $v) {
$maJiaId = $maJiaName = $organizationName = '';
$maJia = $maJiaId = $maJiaName = $maJiaShow = $organizationName = '';
$roleName = '客户';
$userId = intval($v['userId']);
$status = intval($v['status']);
@@ -87,14 +87,17 @@ class Members extends BaseController
$organizationName = $organizationName ? $organizationName . '-' . $map_organization[$v['organizationId']]['organizationName'] :
$map_organization[$v['organizationId']]['organizationName'];
}
if ($v['maJiaId']) {
$maJiaId = intval($v['maJiaId']);
$maJiaName = $map_maJia[$maJiaId]['uname'] ? $map_maJia[$maJiaId]['uname'] : $map_maJia[$maJiaId]['nickname'];
$maJiaName = $maJiaName ? $maJiaName . '(' . $map_maJia[$maJiaId]['mobile'] . ')' : $map_maJia[$maJiaId]['mobile'];
if ($_SESSION['roleCode'] == 'admin') { //角色标识是admin才显示
$maJia = 1;
if ($v['maJiaId']) {
$maJiaId = intval($v['maJiaId']);
$maJiaName = $map_maJia[$maJiaId]['uname'] ? $map_maJia[$maJiaId]['uname'] : $map_maJia[$maJiaId]['nickname'];
$maJiaName = $maJiaName ? $maJiaName . '(' . $map_maJia[$maJiaId]['mobile'] . ')' : $map_maJia[$maJiaId]['mobile'];
}
$maJiaShow = $v['uname'] ? $v['uname'] : $v['nickname'];
$maJiaShow = $maJiaShow ? $maJiaShow . '(' . $v['mobile'] . ')' : $v['mobile'];
}
$maJiaShow = $v['uname'] ? $v['uname'] : $v['nickname'];
$maJiaShow = $maJiaShow ? $maJiaShow . '(' . $v['mobile'] . ')' : $v['mobile'];
$list[] = ['userId' => $userId, 'maJiaId' => $maJiaId, 'maJiaName' => $maJiaName, 'maJiaShow' => $maJiaShow,
$list[] = ['userId' => $userId, 'maJia' => $maJia, 'maJiaId' => $maJiaId, 'maJiaName' => $maJiaName, 'maJiaShow' => $maJiaShow,
'uname' => $v['uname'], 'nickname' => $v['nickname'], 'mobile' => $v['mobile'], 'organizationName' => $organizationName,
'roleName' => $roleName, 'organizationId' => $organizationId, 'status' => $status, 'createTime' => $createTime];
}
market/hooks/ApiAuthHook.php
+1
View File
@@ -72,6 +72,7 @@ class ApiAuthHook
$this->CI->load->model('market/Market_sys_role_model');
$re_role = $this->CI->Market_sys_role_model->get(['roleId' => $re_admin['roleId'], 'status' => 0]);
if ($re_role) {
$_SESSION['roleCode'] = $re_role['roleCode'];//角色标识
$menuIds = $re_role['menuIds'];
if ($re_role['roleCode'] == 'brand') {//品牌角色
$_SESSION['brandName'] = $re_role['roleName'];