From 9016397f14ae0ac289a88684b7b145844a9ba760 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Sat, 28 Jan 2023 15:44:04 +0800
Subject: [PATCH] market_members_128

---
 market/controllers/api/sylive/Members.php | 19 +++++++++++--------
 market/hooks/ApiAuthHook.php              |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/market/controllers/api/sylive/Members.php b/market/controllers/api/sylive/Members.php
index abb90d8c..06577eb2 100644
--- a/market/controllers/api/sylive/Members.php
+++ b/market/controllers/api/sylive/Members.php
@@ -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];
             }
diff --git a/market/hooks/ApiAuthHook.php b/market/hooks/ApiAuthHook.php
index b757a0ed..782d2dab 100644
--- a/market/hooks/ApiAuthHook.php
+++ b/market/hooks/ApiAuthHook.php
@@ -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'];