Merge branch 'dev-master' of 120.27.221.179:gxx123/workbiu-admin into dev-master

app/Http/Controllers/GroupController.php

@@ -39,8 +39,6 @@ class GroupController extends Controller
         if ($groups){
             return view('admin/group/groupinformation',compact('groups','files'));
         }
-
-
         return Message::makeError('查找失败');
     }
 

app/Models/File.php

@@ -10,4 +10,12 @@ class File extends Model
     use SoftDeletes;
 
     protected $dates = ['delete_at'];
+
+    public function fileCreator(){
+        return $this->belongsTo('App\Models\User','creator_id');
+    }
+
+    public function fileInProject(){
+        return $this->belongsTo('App\Models\Folder','project_id');
+    }
 }

resources/views/admin/group/groupinformation.blade.php

@@ -114,8 +114,8 @@
                             <td>{{$file->file_type}}</td>
                             <td>{{$file->size}}</td>
                             <td>{{$file->folder_id}}</td>
-                            <td>{{$file->project_id}}</td>
-                            <td>{{$file->creator_id}}</td>
+                            <td>{{$file->fileInProject->name}}</td>
+                            <td>{{$file->fileCreator->user_name}}</td>
                             <td><a href="{{$file->id}}" class="btn btn-info" > 查看详情</a>
                                 <a href="{{$file->id}}" class="btn bg-orange" > 删除</a>
                             </td>