Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/store/controller/Merchant.php

@@ -54,15 +54,15 @@ class Merchant extends Controller
             if (!in_array($role['role_id'], $nowRoles)) {
                 continue;
             }
-
+            
-            if (!empty($l['user_name'])) {
+            if (!empty($l['store_user_id'])) {
-                array_push($list, $l['user_name']);
+                array_push($list, $l['store_user_id']);
             }
         }
 
         $model2 = new MerchantModel;
         $list2 = $model2->getList($this->request->param())->toArray();
-        $userIds = array_column($list2['data'], "user_name");
+        $userIds = array_column($list2['data'], "store_user_id");
 
         $list = array_diff($list, $userIds);
         return $this->renderSuccess(compact('list'));