Commit f497f3b7 f497f3b7f6d20837720efdad6a417a9a85cd1aa5 by lemon

*

1 parent c903858e
......@@ -226,12 +226,18 @@ class MusicianSongService extends Service
$file = $client->getPreviewUrl($file);
}
$right = $role = [];
$right = $role = $rights = [];
if (!empty($item['contract']['stakeholder_contract'])) {
foreach ($item['contract']['stakeholder_contract'] as $stakeholder_contract) {
if (in_array($stakeholder_contract['stakeholder_id'], $this->stakeholder_ids)) {
$right[] = $stakeholder_contract;
$role = array_merge($role, Contract::transformRole($stakeholder_contract['right_type']));
//新数据
$rights[] = [
'role' => Contract::transformRole($stakeholder_contract['right_type']),
'right' => 'test',
];
}
}
}
......@@ -247,7 +253,7 @@ class MusicianSongService extends Service
'limit' => is_null($item['contract']['date_ending']) ? '永久' : data_diff($item['contract']['date_starting'], $item['contract']['date_ending']),
'district' => Contract::getDistrict($item['contract']['district_id']),
'exclusive' => Contract::isExclusive($item['contract']['is_exclusive']),
'rights' => [['role'=>'作词作曲', 'right'=>'test'],['role'=>'演唱', 'right'=>'test']],
'rights' => $rights,
];
}
......