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

Lyh server



查看合并请求 !3207

@@ -108,6 +108,18 @@ class Project5CateController extends BaseController
         if ($response->successful()) {
         if ($response->successful()) {
             $result = $response->json(); // 获取 JSON 响应体
             $result = $response->json(); // 获取 JSON 响应体
             if($result && $result['status'] == 200){
             if($result && $result['status'] == 200){
+                //todo：：更新分类数据
+                $action1 = $project5CateModel->getCateTypeAction($this->param['type']);
+                $url1 = $projectInfo['website'].'wp-admin/admin-ajax.php?action='.$action1;
+                $data = http_get($url1);
+                if($data && $data['status'] == 200){
+                    $resultData  = $data['data'];
+                    $saveData = [
+                        'text'=>json_encode($data['data']),
+                    ];
+                    $project5CateModel->edit($saveData,['project_id' => $projectInfo['post_id'],'type'=>$this->param['type']]);
+                    $this->response('success', Code::SUCCESS,$resultData);
+                }
                 $this->response('success');
                 $this->response('success');
             }
             }
         }
         }

@@ -24,7 +24,7 @@ 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){
+        if(isset($this->user['project_id']) && $this->user['project_id'] == 5172){
             $this->user['project_id'] = 3298;
             $this->user['project_id'] = 3298;
         }
         }
     }
     }