合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3343

@@ -152,11 +152,11 @@ class ProjectController extends BaseController
         if (isset($this->map['seo_plan']) && $this->map['seo_plan'] == 1) {
             $query = $query->orderBy('gl_project.cooperate_date', 'desc')->orderBy('gl_project.id', 'desc');
         } else {
-            if($this->map['type'] == 1){
-                $query = $query->orderBy('gl_project.id', 'desc');
-            }else{
+//            if($this->map['type'] == 1){
+//                $query = $query->orderBy('gl_project.id', 'desc');
+//            }else{
                 $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc');
-            }
+//            }
         }
         return $query;
     }