|
|
@ -55,10 +55,9 @@ class Merchant extends Controller |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!empty($l['store_user_id']) && !empty($l['user_name'])) { |
|
|
|
if (!empty($l['user_id']) && !empty($l['user_name'])) { |
|
|
|
|
|
|
|
$tmp = [ |
|
|
|
$tmp = [ |
|
|
|
$l['user_id'] => $l['user_name'] |
|
|
|
$l['store_user_id'] => $l['user_name'] |
|
|
|
]; |
|
|
|
]; |
|
|
|
array_push($list, $tmp); |
|
|
|
array_push($list, $tmp); |
|
|
|
} |
|
|
|
} |
|
|
@ -66,7 +65,7 @@ class Merchant extends Controller |
|
|
|
|
|
|
|
|
|
|
|
$model2 = new MerchantModel; |
|
|
|
$model2 = new MerchantModel; |
|
|
|
$list2 = $model2->getList($this->request->param())->toArray(); |
|
|
|
$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) { |
|
|
|
foreach ($list as $kd => $d) { |
|
|
|