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

Lyh server



查看合并请求 !3158

@@ -24,6 +24,9 @@ class GeoQuestionResLogic extends BaseLogic
         parent::__construct();
         parent::__construct();
         $this->model = new GeoQuestionResult();
         $this->model = new GeoQuestionResult();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
+        if($this->user['project_id'] == 5172){
+            $this->user['project_id'] = 3298;
+        }
     }
     }
 
 
     /**
     /**

@@ -40,6 +40,15 @@ use Illuminate\Support\Str;
 class RankDataLogic extends BaseLogic
 class RankDataLogic extends BaseLogic
 {
 {
 
 
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        if($this->user['project_id'] == 5172){
+            $this->user['project_id'] = 3298;
+        }
+    }
+
     /**
     /**
      * 统计数据
      * 统计数据
      * @author zbj
      * @author zbj