*

@@ -11,7 +11,7 @@ class PropertyTrackFile extends BaseModel
     protected $guarded = [];
 
     public $hidden = [
-        'deleted_at', 'updated_at', 'from', 'id', 'pt_id', 'file_id',
+        'deleted_at', 'updated_at', 'id', 'pt_id', 'file_id',
     ];
 
     /**

@@ -92,6 +92,23 @@ class PropertyTrackService extends Service
         $trackFiles = PropertyTrackFile::query()->with('ptfTypes.type:id,type_name,remark')->where(['pt_id'=>$this->request->input('track_id')])
                         ->orderByDesc('id')->paginate($this->pageSize);
 
+        $user_ids = [];
+        foreach ($trackFiles as $item) {
+            if ($item['from'] == 1) {
+                $user_ids[] = $item->upload_user;
+            }
+        }
+
+        if ($user_ids) {
+            $user_ids = AppCompanyUser::query()->whereIn('id', array_unique($user_ids))->pluck('name','id')->toArray();
+        }
+
+        foreach ($trackFiles as &$item) {
+            if ($item['from'] == 1) {
+                $item->upload_user = $user_ids[$item->upload_user] ?? '';
+            }
+        }
+
         return Response::success($trackFiles);
     }
 
@@ -218,9 +235,15 @@ class PropertyTrackService extends Service
         $data = [];
 
         //详情
-        if ($track = PropertyTrack::query()->with('project:id,name')->where(['id'=>$this->request->get('track_id'), 'from'=>1])->first()) {
-            $user  = AppCompany::query()->where(['company_id'=>$track->create_admin])->first();
-            $track->setAttribute('submit_name', $user ? $user->company_name : '');
+        if ($track = PropertyTrack::query()->with('project:id,name')->where(['id'=>$this->request->get('track_id')])->first()) {
+
+            if ($track->from) {
+                $record = AppCompany::query()->where(['company_id'=>$track->last_admin])->select(['company_name as name'])->first();
+            } else {
+                $record = User::query()->where(['user_id'=>$track->last_admin])->select(['name'])->first();
+            }
+
+            $track->setAttribute('submit_name', $record ? $record->name : '');
             $data = $track;
         }