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

Lyh server



查看合并请求 !2142

@@ -61,6 +61,7 @@ class ProjectController extends BaseController
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
             ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
             ->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id')
             ->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id')
+            ->leftJoin('gl_project_association', 'gl_project.id', '=', 'gl_project_association.project_id')
             ->where('gl_project.delete_status',Project::TYPE_ZERO);
             ->where('gl_project.delete_status',Project::TYPE_ZERO);
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $query = $this->orderByList($query);
         $query = $this->orderByList($query);
@@ -122,6 +123,7 @@ class ProjectController extends BaseController
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.api_no AS api_no',
             'gl_project_deploy_optimize.api_no AS api_no',
             'gl_web_setting_template.template_id AS template_id',
             'gl_web_setting_template.template_id AS template_id',
+            'gl_project_association.friend_id as friend_id'
         ];
         ];
         return $select;
         return $select;
     }
     }
@@ -295,6 +297,16 @@ class ProjectController extends BaseController
         if(isset($this->map['plan'])){
         if(isset($this->map['plan'])){
             $query = $query->where('gl_project_deploy_build.plan',$this->map['plan']);
             $query = $query->where('gl_project_deploy_build.plan',$this->map['plan']);
         }
         }
+        if(isset($this->map['friend_id'])){
+            if($this->map['friend_id'] == 1){
+                $query = $query->where('gl_project_association.friend_id', '!=', 0);
+            }else{
+                $query = $query->where(function ($subQuery) {
+                    $subQuery->where('gl_project_association.friend_id', 0)
+                        ->orWhereNull('gl_project_association.friend_id');
+                });
+            }
+        }
         if(isset($this->map['seo_plan'])){
         if(isset($this->map['seo_plan'])){
             $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
             $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
         }
         }