revert

app/store/controller/Merchant.php

@@ -55,11 +55,8 @@ class Merchant extends Controller
                 continue;
             }
 
-            if (!empty($l['store_user_id']) && !empty($l['user_name'])) {
-                $tmp = [
-                    $l['store_user_id'] => $l['user_name']
-                ];
-                array_push($list, $tmp);
+            if (!empty($l['user_name'])) {
+                array_push($list, $l['user_name']);
             }
         }
 
@@ -67,14 +64,7 @@ class Merchant extends Controller
         $list2 = $model2->getList($this->request->param())->toArray();
         $userIds = array_column($list2['data'], "user_name");
 
-
-        foreach ($list as $kd => $d) {
-            if (in_array($kd, $userIds)) {
-                unset($list[$kd]);
-            }
-        }
-
-        //$list = array_diff($list, $userIds);
+        $list = array_diff($list, $userIds);
         return $this->renderSuccess(compact('list'));
     }