From b8030c3e3558a39d10dcbb12534a1bac22a607cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=98=89?= <445241500@qq.com>
Date: Mon, 20 May 2024 21:58:19 +0800
Subject: [PATCH] 1

---
 app/store/controller/Merchant.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/store/controller/Merchant.php b/app/store/controller/Merchant.php
index cbdc2fdd..f187ec89 100644
--- a/app/store/controller/Merchant.php
+++ b/app/store/controller/Merchant.php
@@ -19,6 +19,8 @@ use app\store\model\Merchant as MerchantModel;
 use app\store\model\Style as StyleModel;
 use app\common\model\Channel;
 use app\store\model\store\User as StoreUserModel;
+use app\store\model\store\Role as role;
+use app\common\model\store\UserRole as UserRoleModel;
 
 /**
  * 商户ID、商店ID 隔离商城里面的商户
@@ -27,16 +29,32 @@ use app\store\model\store\User as StoreUserModel;
  */
 class Merchant extends Controller
 {
+    const ROLE_NAME = '商户';
     /**
      * 获取当前登录的商城信息
      * @return Json
      */
     public function userinfo(): Json
     {
+        $list = [];
+        $whererole = [
+            'store_id' => $this->storeId,
+            'role_name' => self::ROLE_NAME
+        ];
+        $role = role::detail($whererole);
+        if (empty($role)) {
+            return $this->renderSuccess(compact('list'));
+        }
+
         $model = new StoreUserModel;
         $listUser = $model->getList($this->request->param())->toArray();
         $list = [];
         foreach ($listUser['data'] as $l) {
+            $nowRoles = $l['roleIds'];
+            if (!in_array($role['role_id'], $nowRoles)) {
+                continue;
+            }
+
             if (!empty($l['user_name'])) {
                 array_push($list, $l['user_name']);
             }