*
Showing
2 changed files
with
6 additions
and
4 deletions
... | @@ -10,7 +10,7 @@ class PropertyTrack extends BaseModel | ... | @@ -10,7 +10,7 @@ class PropertyTrack extends BaseModel |
10 | use SoftDeletes; | 10 | use SoftDeletes; |
11 | 11 | ||
12 | public $hidden = [ | 12 | public $hidden = [ |
13 | 'deleted_at', 'updated_at', 'apply_id', 'song_id', 'project_id', 'company_id' | 13 | 'deleted_at', 'updated_at', 'apply_id', 'song_id', 'project_id', 'company_id', 'from', 'last_admin', 'create_admin' |
14 | ]; | 14 | ]; |
15 | 15 | ||
16 | public $guarded = []; | 16 | public $guarded = []; | ... | ... |
... | @@ -8,6 +8,7 @@ use App\Models\Legal\Contract; | ... | @@ -8,6 +8,7 @@ use App\Models\Legal\Contract; |
8 | use App\Models\Legal\PropertyTrack; | 8 | use App\Models\Legal\PropertyTrack; |
9 | use App\Models\Legal\StakeholderContract; | 9 | use App\Models\Legal\StakeholderContract; |
10 | use App\Models\Legal\Treaty; | 10 | use App\Models\Legal\Treaty; |
11 | use App\Models\Musician\AppCompany; | ||
11 | use App\Models\Musician\AppCompanyUser; | 12 | use App\Models\Musician\AppCompanyUser; |
12 | use Illuminate\Database\Eloquent\Builder; | 13 | use Illuminate\Database\Eloquent\Builder; |
13 | use Qcloud\Cos\Client; | 14 | use Qcloud\Cos\Client; |
... | @@ -44,10 +45,11 @@ class PropertyTrackService extends Service | ... | @@ -44,10 +45,11 @@ class PropertyTrackService extends Service |
44 | { | 45 | { |
45 | $data = []; | 46 | $data = []; |
46 | 47 | ||
48 | //详情 | ||
47 | if ($track = PropertyTrack::query()->where(['id'=>$this->request->input('track_id'), 'from'=>1])->first()) { | 49 | if ($track = PropertyTrack::query()->where(['id'=>$this->request->input('track_id'), 'from'=>1])->first()) { |
48 | $user = AppCompanyUser::query()->where(['id'=>$track->create_admin])->first(); | 50 | $user = AppCompany::query()->where(['company_id'=>$track->create_admin])->first(); |
49 | $track->setAttribute('submit_name', $user ? $user->name : ''); | 51 | $track->setAttribute('submit_name', $user ? $user->company_name : ''); |
50 | return Response::success(); | 52 | $data = $track; |
51 | } | 53 | } |
52 | 54 | ||
53 | return Response::success($data); | 55 | return Response::success($data); | ... | ... |
-
Please register or sign in to post a comment