From d454e6ef8642ec5e09beec883bf8b4aaa8e6dca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=98=89?= <445241500@qq.com>
Date: Tue, 11 Jun 2024 23:06:59 +0800
Subject: [PATCH] trac

---
 app/store/controller/Merchant.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/store/controller/Merchant.php b/app/store/controller/Merchant.php
index e666a629..cb0d924e 100644
--- a/app/store/controller/Merchant.php
+++ b/app/store/controller/Merchant.php
@@ -55,10 +55,9 @@ class Merchant extends Controller
                 continue;
             }
 
-
-            if (!empty($l['user_id']) && !empty($l['user_name'])) {
+            if (!empty($l['store_user_id']) && !empty($l['user_name'])) {
                 $tmp = [
-                    $l['user_id'] => $l['user_name']
+                    $l['store_user_id'] => $l['user_name']
                 ];
                 array_push($list, $tmp);
             }
@@ -66,7 +65,7 @@ class Merchant extends Controller
 
         $model2 = new MerchantModel;
         $list2 = $model2->getList($this->request->param())->toArray();
-        $userIds = array_column($list2['data'], "user_id");
+        $userIds = array_column($list2['data'], "user_name");
 
 
         foreach ($list as $kd => $d) {