Commit f497f3b7 f497f3b7f6d20837720efdad6a417a9a85cd1aa5 by lemon

*

1 parent c903858e
...@@ -226,12 +226,18 @@ class MusicianSongService extends Service ...@@ -226,12 +226,18 @@ class MusicianSongService extends Service
226 $file = $client->getPreviewUrl($file); 226 $file = $client->getPreviewUrl($file);
227 } 227 }
228 228
229 $right = $role = []; 229 $right = $role = $rights = [];
230 if (!empty($item['contract']['stakeholder_contract'])) { 230 if (!empty($item['contract']['stakeholder_contract'])) {
231 foreach ($item['contract']['stakeholder_contract'] as $stakeholder_contract) { 231 foreach ($item['contract']['stakeholder_contract'] as $stakeholder_contract) {
232 if (in_array($stakeholder_contract['stakeholder_id'], $this->stakeholder_ids)) { 232 if (in_array($stakeholder_contract['stakeholder_id'], $this->stakeholder_ids)) {
233 $right[] = $stakeholder_contract; 233 $right[] = $stakeholder_contract;
234 $role = array_merge($role, Contract::transformRole($stakeholder_contract['right_type'])); 234 $role = array_merge($role, Contract::transformRole($stakeholder_contract['right_type']));
235
236 //新数据
237 $rights[] = [
238 'role' => Contract::transformRole($stakeholder_contract['right_type']),
239 'right' => 'test',
240 ];
235 } 241 }
236 } 242 }
237 } 243 }
...@@ -247,7 +253,7 @@ class MusicianSongService extends Service ...@@ -247,7 +253,7 @@ class MusicianSongService extends Service
247 'limit' => is_null($item['contract']['date_ending']) ? '永久' : data_diff($item['contract']['date_starting'], $item['contract']['date_ending']), 253 'limit' => is_null($item['contract']['date_ending']) ? '永久' : data_diff($item['contract']['date_starting'], $item['contract']['date_ending']),
248 'district' => Contract::getDistrict($item['contract']['district_id']), 254 'district' => Contract::getDistrict($item['contract']['district_id']),
249 'exclusive' => Contract::isExclusive($item['contract']['is_exclusive']), 255 'exclusive' => Contract::isExclusive($item['contract']['is_exclusive']),
250 'rights' => [['role'=>'作词作曲', 'right'=>'test'],['role'=>'演唱', 'right'=>'test']], 256 'rights' => $rights,
251 ]; 257 ];
252 } 258 }
253 259
......