Merge branch 'master' of http://git.9026.com/Silent/RailwayTwo

app/Models/Notification.php

@@ -202,7 +202,7 @@ class Notification extends BaseModel
         if(!$project_user) return false;
         $project = Project::find($project_user->project_id);
         if($project && isset($project['user_id'])) {
-            $user = User::find($project['user_id']);
+            $user = User::find($project_user->user_id);
             $role = ProjectRole::find($project_user['project_role_id']);
             $work_point = WorkPoint::find($project['work_point_id']);
             if($user) {

app/Models/Project.php

@@ -117,7 +117,7 @@ class Project extends BaseModel
 
     public static function getOptions()
     {
-        return self::where('id', '>', 1)->get()->toArray();
+        return self::get()->toArray();
     }
     public static function getNotOneProjectOptions(){
         return self::where('id','!=',1)->get();