合并分支 'akun' 到 'master'

update



查看合并请求 !3339

@@ -11,6 +11,7 @@ use App\Enums\Common\Code;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlog;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
+use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Industry\ProjectIndustryRelated;
 use App\Models\Industry\ProjectIndustryRelated;
 use App\Models\Inquiry\InquiryRelateDomain;
 use App\Models\Inquiry\InquiryRelateDomain;
@@ -48,10 +49,11 @@ class PrivateController extends BaseController
     public function optimizeProjectList(Request $request)
     public function optimizeProjectList(Request $request)
     {
     {
         $page_size = $request->input('page_size', 20);
         $page_size = $request->input('page_size', 20);
-        $field = ['gl_project.id', 'gl_project.company', 'gl_project.post_id' ,'gl_project.is_upgrade', 'b.start_date', 'd.domain', 'b.special', 'gl_project.from_order_id'];// 'f.industry_name',
+        $field = ['gl_project.id', 'gl_project.company', 'gl_project.post_id' ,'gl_project.is_upgrade', 'b.start_date', 'd.domain', 'b.special', 'gl_project.from_order_id','g.servers_id'];// 'f.industry_name',
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
+            ->leftJoin('gl_servers_ip as g', 'gl_project.serve_id', '=', 'g.id')
 //            ->leftJoin('gl_project_industry_related as e', 'gl_project.id', '=', 'e.project_id')
 //            ->leftJoin('gl_project_industry_related as e', 'gl_project.id', '=', 'e.project_id')
 //            ->leftJoin('gl_project_industry as f', 'e.industry_id', '=', 'f.id')
 //            ->leftJoin('gl_project_industry as f', 'e.industry_id', '=', 'f.id')
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.type', Project::TYPE_TWO)
@@ -67,8 +69,10 @@ class PrivateController extends BaseController
         // 直接关联查询， 会出现数据错误
         // 直接关联查询， 会出现数据错误
         $project_ids = array_column($result['list'], 'id');
         $project_ids = array_column($result['list'], 'id');
         $industry = ProjectIndustryRelated::leftJoin('gl_project_industry', 'gl_project_industry_related.industry_id', '=', 'gl_project_industry.id')->whereIn('project_id', $project_ids)->pluck('industry_name', 'project_id')->toArray();
         $industry = ProjectIndustryRelated::leftJoin('gl_project_industry', 'gl_project_industry_related.industry_id', '=', 'gl_project_industry.id')->whereIn('project_id', $project_ids)->pluck('industry_name', 'project_id')->toArray();
+
         foreach ($result['list'] as &$val) {
         foreach ($result['list'] as &$val) {
             $val['industry_name'] = FALSE == empty($industry[$val['id']]) ? $industry[$val['id']] : '';
             $val['industry_name'] = FALSE == empty($industry[$val['id']]) ? $industry[$val['id']] : '';
+            $val['is_self_site'] = $val['servers_id'] == ServerConfig::SELF_SITE_ID ? 1 : 0;
         }
         }
 
 
         return $this->success($result);
         return $this->success($result);