合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !1955

@@ -285,7 +285,7 @@ class PrivateController extends BaseController
     public function getProjectOnline(Request $request)
     public function getProjectOnline(Request $request)
     {
     {
         $page_size = intval($request->input('page_size', 20));
         $page_size = intval($request->input('page_size', 20));
-        $projects = Project::select(['id', 'title', 'company', 'type', 'finish_remain_day', 'remain_day'])->whereIn('type', [2, 3, 4, 6])->where('delete_status', 0)->paginate($page_size);
+        $projects = Project::select(['id', 'title', 'company', 'type', 'finish_remain_day', 'remain_day'])->where('extend_type', 0)->whereIn('type', [2, 3, 4, 6])->where('delete_status', 0)->paginate($page_size);
         foreach ($projects as $project) {
         foreach ($projects as $project) {
             $project->domain = $project->domainInfo ? $project->domainInfo->domain : '';
             $project->domain = $project->domainInfo ? $project->domainInfo->domain : '';
         }
         }
@@ -354,7 +354,7 @@ class PrivateController extends BaseController
     public function upgradeProjectDomain()
     public function upgradeProjectDomain()
     {
     {
         $domain = Project::leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
         $domain = Project::leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
-            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE])
+            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE, 'gl_project.extend_type' => 0])
             ->pluck('domain')
             ->pluck('domain')
             ->toArray();
             ->toArray();
         $list = array_filter(array_unique($domain));
         $list = array_filter(array_unique($domain));

@@ -805,7 +805,7 @@ class ProjectController extends BaseController
                   "id" => $item['id'],
                   "id" => $item['id'],
                   "title" => $item['title'],
                   "title" => $item['title'],
                   "company" => $item['company'],
                   "company" => $item['company'],
-                  "type" => $item['type'],
+                  "type" => $item['extend_type'] ?: $item['type'],
                   "type_text" => Project::typeMap()[$item['type']] ?? '',
                   "type_text" => Project::typeMap()[$item['type']] ?? '',
                   "channel" => $item['channel'],
                   "channel" => $item['channel'],
                   "created_at" => $item['created_at'],
                   "created_at" => $item['created_at'],