Commit 23e68266 23e68266a599d6aa67b53f275e21f8a9d80344b6 by lemon

*

1 parent 6ef57e1c
......@@ -10,7 +10,7 @@ class PropertyTrack extends BaseModel
use SoftDeletes;
public $hidden = [
'deleted_at', 'updated_at', 'apply_id', 'song_id', 'project_id', 'company_id'
'deleted_at', 'updated_at', 'apply_id', 'song_id', 'project_id', 'company_id', 'from', 'last_admin', 'create_admin'
];
public $guarded = [];
......
......@@ -8,6 +8,7 @@ use App\Models\Legal\Contract;
use App\Models\Legal\PropertyTrack;
use App\Models\Legal\StakeholderContract;
use App\Models\Legal\Treaty;
use App\Models\Musician\AppCompany;
use App\Models\Musician\AppCompanyUser;
use Illuminate\Database\Eloquent\Builder;
use Qcloud\Cos\Client;
......@@ -44,10 +45,11 @@ class PropertyTrackService extends Service
{
$data = [];
//详情
if ($track = PropertyTrack::query()->where(['id'=>$this->request->input('track_id'), 'from'=>1])->first()) {
$user = AppCompanyUser::query()->where(['id'=>$track->create_admin])->first();
$track->setAttribute('submit_name', $user ? $user->name : '');
return Response::success();
$user = AppCompany::query()->where(['company_id'=>$track->create_admin])->first();
$track->setAttribute('submit_name', $user ? $user->company_name : '');
$data = $track;
}
return Response::success($data);
......