diff --git a/app/store/controller/Merchant.php b/app/store/controller/Merchant.php index 4f3c86aa..e666a629 100644 --- a/app/store/controller/Merchant.php +++ b/app/store/controller/Merchant.php @@ -55,16 +55,27 @@ class Merchant extends Controller continue; } - if (!empty($l['user_name'])) { - array_push($list, $l['user_name']); + + if (!empty($l['user_id']) && !empty($l['user_name'])) { + $tmp = [ + $l['user_id'] => $l['user_name'] + ]; + array_push($list, $tmp); } } $model2 = new MerchantModel; $list2 = $model2->getList($this->request->param())->toArray(); - $userIds = array_column($list2['data'], "user_name"); + $userIds = array_column($list2['data'], "user_id"); + + + 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')); }