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

变更数据



查看合并请求 !3137

@@ -88,9 +88,11 @@ class ProjectLogic extends BaseLogic
      */
      */
     public function getProjectInfo($id = ''){
     public function getProjectInfo($id = ''){
         if(!empty($id)){
         if(!empty($id)){
-            $this->param['id'] = $id;
+            $query = $this->model->formatQuery(['id'=>$id]);
+        }else{
+            $query = $this->model->formatQuery($this->param);
         }
         }
-        $info = $this->model->formatQuery($this->param)->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
+        $info = $query->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check',
             'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->first()->toArray();
             'project_after','inquiry_filter_config','web_traffic_config','project_keyword'])->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];